diff --git a/.github/workflows/install_deps.py b/.github/workflows/install_deps.py index cf1842ec..82f0a6cc 100644 --- a/.github/workflows/install_deps.py +++ b/.github/workflows/install_deps.py @@ -45,6 +45,8 @@ def install_packages(what): packages['exhibitor'] = packages['zookeeper'] packages = packages.get(what, []) ver = versions.get(what) + if float(ver) >= 15: + packages += ['postgresql-{0}-citus-11.2'.format(ver)] subprocess.call(['sudo', 'apt-get', 'update', '-y']) return subprocess.call(['sudo', 'apt-get', 'install', '-y', 'postgresql-' + ver, 'expect-dev'] + packages) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 41dbe83d..aea92626 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -110,12 +110,14 @@ jobs: python-version: ${{ matrix.python-version }} - uses: nolar/setup-k3d-k3s@v1 if: matrix.dcs == 'kubernetes' - - name: Add postgresql apt repo + - name: Add postgresql and citus apt repo run: | sudo apt-get update -y - sudo apt-get install -y wget ca-certificates gnupg + sudo apt-get install -y wget ca-certificates gnupg debian-archive-keyring apt-transport-https sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' sudo sh -c 'wget -qO - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > /etc/apt/trusted.gpg.d/apt.postgresql.org.gpg' + sudo sh -c 'echo "deb [signed-by=/etc/apt/trusted.gpg.d/citusdata_community.gpg] https://repos.citusdata.com/community/ubuntu/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/citusdata_community.list' + sudo sh -c 'wget -qO - https://repos.citusdata.com/community/gpgkey | gpg --dearmor > /etc/apt/trusted.gpg.d/citusdata_community.gpg' if: matrix.os == 'ubuntu' - name: Install dependencies run: python .github/workflows/install_deps.py diff --git a/Dockerfile.citus b/Dockerfile.citus index a4c9ed04..d5432b15 100644 --- a/Dockerfile.citus +++ b/Dockerfile.citus @@ -27,7 +27,7 @@ RUN set -ex \ python3-etcd python3-kazoo python3-pip busybox \ net-tools iputils-ping --fix-missing \ && curl https://install.citusdata.com/community/deb.sh | bash \ - && apt-get -y install postgresql-$PG_MAJOR-citus-11.1 \ + && apt-get -y install postgresql-$PG_MAJOR-citus-11.2 \ && pip3 install dumb-init \ \ # Cleanup all locales but en_US.UTF-8 diff --git a/kubernetes/Dockerfile.citus b/kubernetes/Dockerfile.citus index 103f89ff..de3ecb0b 100644 --- a/kubernetes/Dockerfile.citus +++ b/kubernetes/Dockerfile.citus @@ -11,7 +11,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ ## Make sure we have a en_US.UTF-8 locale available && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 \ && curl https://install.citusdata.com/community/deb.sh | bash \ - && apt-get -y install postgresql-15-citus-11.1 \ + && apt-get -y install postgresql-15-citus-11.2 \ && pip3 install setuptools \ && pip3 install 'git+https://github.com/zalando/patroni.git#egg=patroni[kubernetes]' \ && PGHOME=/home/postgres \