mirror of
https://github.com/outbackdingo/patroni.git
synced 2026-08-25 14:53:37 +00:00
Switch to Citus 11.2 (#2548)
- Update Dockerfile.citus files - Enable behave tests with Citus
This commit is contained in:
@@ -45,6 +45,8 @@ def install_packages(what):
|
|||||||
packages['exhibitor'] = packages['zookeeper']
|
packages['exhibitor'] = packages['zookeeper']
|
||||||
packages = packages.get(what, [])
|
packages = packages.get(what, [])
|
||||||
ver = versions.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'])
|
subprocess.call(['sudo', 'apt-get', 'update', '-y'])
|
||||||
return subprocess.call(['sudo', 'apt-get', 'install', '-y', 'postgresql-' + ver, 'expect-dev'] + packages)
|
return subprocess.call(['sudo', 'apt-get', 'install', '-y', 'postgresql-' + ver, 'expect-dev'] + packages)
|
||||||
|
|
||||||
|
|||||||
@@ -110,12 +110,14 @@ jobs:
|
|||||||
python-version: ${{ matrix.python-version }}
|
python-version: ${{ matrix.python-version }}
|
||||||
- uses: nolar/setup-k3d-k3s@v1
|
- uses: nolar/setup-k3d-k3s@v1
|
||||||
if: matrix.dcs == 'kubernetes'
|
if: matrix.dcs == 'kubernetes'
|
||||||
- name: Add postgresql apt repo
|
- name: Add postgresql and citus apt repo
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -y
|
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 '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 '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'
|
if: matrix.os == 'ubuntu'
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: python .github/workflows/install_deps.py
|
run: python .github/workflows/install_deps.py
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ RUN set -ex \
|
|||||||
python3-etcd python3-kazoo python3-pip busybox \
|
python3-etcd python3-kazoo python3-pip busybox \
|
||||||
net-tools iputils-ping --fix-missing \
|
net-tools iputils-ping --fix-missing \
|
||||||
&& curl https://install.citusdata.com/community/deb.sh | bash \
|
&& 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 \
|
&& pip3 install dumb-init \
|
||||||
\
|
\
|
||||||
# Cleanup all locales but en_US.UTF-8
|
# Cleanup all locales but en_US.UTF-8
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
|
|||||||
## Make sure we have a en_US.UTF-8 locale available
|
## 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 \
|
&& 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 \
|
&& 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 setuptools \
|
||||||
&& pip3 install 'git+https://github.com/zalando/patroni.git#egg=patroni[kubernetes]' \
|
&& pip3 install 'git+https://github.com/zalando/patroni.git#egg=patroni[kubernetes]' \
|
||||||
&& PGHOME=/home/postgres \
|
&& PGHOME=/home/postgres \
|
||||||
|
|||||||
Reference in New Issue
Block a user