Skip to content

Commit 11bd982

Browse files
authored
Update Citus version matrix with new Citus releases. (#990)
* Update Citus version matrix with new Citus releases. Should also bring the CI back to green with Citus fixes when building with Postgres 14 (API changes did break the build). * CI now uses black v23.3.0, update local version and make indent.
1 parent dc39598 commit 11bd982

File tree

7 files changed

+10
-5
lines changed

7 files changed

+10
-5
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ DOCS_PORT = 8000
2626
PGVERSION ?= 14
2727

2828
BUILD_ARGS_PG11 = --build-arg PGVERSION=11 --build-arg CITUSTAG=v9.5.10
29-
BUILD_ARGS_PG12 = --build-arg PGVERSION=12 --build-arg CITUSTAG=v10.2.3
30-
BUILD_ARGS_PG13 = --build-arg PGVERSION=13 --build-arg CITUSTAG=v10.2.3
31-
BUILD_ARGS_PG14 = --build-arg PGVERSION=14 --build-arg CITUSTAG=v11.1.3
32-
BUILD_ARGS_PG15 = --build-arg PGVERSION=15 --build-arg CITUSTAG=v11.1.3
29+
BUILD_ARGS_PG12 = --build-arg PGVERSION=12 --build-arg CITUSTAG=v10.2.9
30+
BUILD_ARGS_PG13 = --build-arg PGVERSION=13 --build-arg CITUSTAG=v10.2.9
31+
BUILD_ARGS_PG14 = --build-arg PGVERSION=14 --build-arg CITUSTAG=v11.2.1
32+
BUILD_ARGS_PG15 = --build-arg PGVERSION=15 --build-arg CITUSTAG=v11.2.1
3333

3434
NOSETESTS = $(shell which nosetests3 || which nosetests)
3535

docs/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ def __init__(self, **options):
107107
#
108108
# html_theme_options = {}
109109

110+
110111
# Add our custom CSS
111112
def setup(app):
112113
if hasattr(app, "add_css_file"):

tests/pgautofailover_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
NodeState = namedtuple("NodeState", "reported assigned")
2323

24+
2425
# Append stderr output to default CalledProcessError message
2526
class CalledProcessError(subprocess.CalledProcessError):
2627
def __str__(self):
@@ -1693,7 +1694,6 @@ def __init__(
16931694
sslServerKey=None,
16941695
sslServerCert=None,
16951696
):
1696-
16971697
super().__init__(
16981698
cluster,
16991699
datadir,

tests/tablespaces/test_tablespaces_03.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from tests.tablespaces.tablespace_utils import node1
33
from tests.tablespaces.tablespace_utils import node2
44

5+
56
# Failover is performed by the makefile Makefile, wait for it to complete
67
def test_001_wait_for_failover_and_insert():
78
assert node2.wait_until_state(target_state="primary")

tests/tablespaces/test_tablespaces_04.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from nose.tools import *
22
from tests.tablespaces.tablespace_utils import node2
33

4+
45
# Node 1 is paused by the Makefile, wait for pgaf to acknowledge
56
def test_001_old_primary_goes_down():
67
assert node2.wait_until_state(target_state="wait_primary")

tests/tablespaces/test_tablespaces_05.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from tests.tablespaces.tablespace_utils import node1
33
from tests.tablespaces.tablespace_utils import node2
44

5+
56
# Node 1 is brought back online by makefile, wait until it's up and replicating
67
def test_001_original_primary_comes_back_up():
78
assert node1.wait_until_state(target_state="secondary")

tests/tablespaces/test_tablespaces_06.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from tests.tablespaces.tablespace_utils import node1
33
from tests.tablespaces.tablespace_utils import node2
44

5+
56
# Failover is performed by the makefile Makefile, wait for it to complete
67
def test_001_promote_the_original_primary_successfully():
78
assert node1.wait_until_state(target_state="primary")

0 commit comments

Comments
 (0)