Skip to content

Commit 4321608

Browse files
committed
remove focal as it is not possible to build pg14 and up. add noble instead
1 parent 8388170 commit 4321608

File tree

9 files changed

+90
-11
lines changed

9 files changed

+90
-11
lines changed

.github/workflows/build-citus-community-nightlies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- debian/bookworm
3131
- debian/trixie
3232
- ubuntu/bionic
33-
- ubuntu/focal
33+
- ubuntu/noble
3434
- ubuntu/jammy
3535

3636
steps:

.github/workflows/citus-package-all-platforms-test.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ jobs:
2929
- ol/8
3030
- debian/stretch
3131
- debian/bullseye
32-
- debian/trixie
3332
- ubuntu/bionic
34-
- ubuntu/focal
33+
- ubuntu/noble
3534
env:
3635
PLATFORM: ${{ matrix.platform }}
3736

.github/workflows/package-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jobs:
3737
export PROJECT_VERSION="${{ github.event.inputs.project_version }}"
3838
echo "project_version: ${{ github.event.inputs.project_version }}"
3939
# To be able to test pipeline without triggering with project_version parameter using workflow_dispatch parameter,
40-
# if workflow_dispatch parameter is empty, 12.1.0 parameter is set to execute pipeline.
41-
[ -z ${PROJECT_VERSION} ] && export PROJECT_VERSION=12.1.0
40+
# if workflow_dispatch parameter is empty, 12.1.5 parameter is set to execute pipeline.
41+
[ -z ${PROJECT_VERSION} ] && export PROJECT_VERSION=12.1.5
4242
POSTGRES_VERSIONS=$(python -m packaging_automation.get_postgres_versions --project_version ${PROJECT_VERSION})
4343
echo "Postgres Version: ${POSTGRES_VERSIONS}"
4444
echo "::set-output name=pg_versions::${POSTGRES_VERSIONS}"
@@ -54,7 +54,7 @@ jobs:
5454
- ol/9
5555
- debian/bullseye
5656
- debian/bookworm
57-
- ubuntu/focal
57+
- ubuntu/noble
5858
- ubuntu/jammy
5959
pg: ${{ fromJson(needs.metadata.outputs.pg_versions) }}
6060
env:
@@ -74,7 +74,7 @@ jobs:
7474
run: |
7575
export PROJECT_VERSION="${{ github.event.inputs.project_version }}"
7676
echo "Citus Version: ${PROJECT_VERSION} "
77-
[ -z ${PROJECT_VERSION} ] && export PROJECT_VERSION=12.1.0
77+
[ -z ${PROJECT_VERSION} ] && export PROJECT_VERSION=12.1.5
7878
python -m packaging_automation.test_citus_package \
7979
--project_version "${PROJECT_VERSION}" \
8080
--os_release ${{ matrix.platform }} \

packaging/citus_package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use constant PACKAGE_URL => ## no critic (ProhibitConstantPragma)
2525
'https://github.com/citusdata/packaging/archive';
2626

2727
my %supported_platforms = (
28-
debian => [ "buster", "stretch", "jessie", "wheezy", "trixie" ],
28+
debian => [ "buster", "stretch", "jessie", "wheezy"],
2929
el => [ "8", "7", "6" ],
3030
fedora => [ "28", "27", "26"],
3131
ol => [ "8", "7", "6" ],

packaging_automation/templates/docker/postgres-18/postgres-18.tmpl.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ RUN apt-get update \
2121
&& curl -s https://install.citusdata.com/community/deb.sh | bash \
2222
&& apt-get install -y postgresql-$PG_MAJOR-citus-{{project_minor_version}}=$CITUS_VERSION \
2323
postgresql-$PG_MAJOR-hll=2.18.citus-1 \
24-
postgresql-$PG_MAJOR-topn=2.6.0.citus-1 \
24+
postgresql-$PG_MAJOR-topn=2.7.0.citus-1 \
2525
&& apt-get purge -y --auto-remove curl \
2626
&& rm -rf /var/lib/apt/lists/*
2727

packaging_automation/test_citus_package.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class TestPlatform(Enum):
4343
ubuntu_bionic = {"name": "ubuntu/bionic", "docker_image_name": "ubuntu-bionic"}
4444
ubuntu_focal = {"name": "ubuntu/focal", "docker_image_name": "ubuntu-focal"}
4545
ubuntu_jammy = {"name": "ubuntu/jammy", "docker_image_name": "ubuntu-jammy"}
46+
ubuntu_noble = {"name": "ubuntu/noble", "docker_image_name": "ubuntu-noble"}
4647
ubuntu_kinetic = {"name": "ubuntu/kinetic", "docker_image_name": "ubuntu-kinetic"}
4748
undefined = {"name": "undefined", "docker_image_name": "undefined"}
4849

packaging_automation/tests/test_citus_package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"debian/bookworm": 2,
5353
"debian/trixie": 2,
5454
"ubuntu/bionic": 2,
55-
"ubuntu/focal": 2,
55+
"ubuntu/noble": 2,
5656
"ubuntu/jammy": 2,
5757
"ubuntu/kinetic": 2,
5858
"ubuntu/noble": 2,

packaging_automation/upload_to_package_cloud.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
"debian/buster": 150,
2121
"debian/bullseye": 207,
2222
"debian/bookworm": 215,
23-
"debian/trixie": 250,
23+
"debian/trixie": 291,
2424
"ubuntu/bionic": 190,
2525
"ubuntu/focal": 210,
2626
"ubuntu/jammy": 237,
27+
"ubuntu/noble": 284,
2728
"ubuntu/kinetic": 261,
2829
}
2930

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
FROM ubuntu:noble
2+
ARG CITUS_VERSION
3+
# FOrmat should be XY and should not include dots e.g for 10.2.1=>102
4+
ARG CITUS_MAJOR_VERSION
5+
ARG PG_MAJOR
6+
ARG FANCY=1
7+
ARG HLL_VERSION=2.18.citus-1
8+
ARG TOPN_VERSION=2.6.0.citus-1
9+
10+
ENV CITUS_VERSION ${CITUS_VERSION}
11+
12+
ENV PG_MAJOR ${PG_MAJOR}
13+
14+
ENV TZ=Europe/Istanbul
15+
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
16+
17+
# install prequisities
18+
RUN apt-get update \
19+
&& apt-get install -y lsb-release \
20+
apt-utils \
21+
vim \
22+
wget \
23+
curl \
24+
gnupg2 \
25+
software-properties-common \
26+
libcurl4-openssl-dev \
27+
libssl-dev
28+
29+
30+
# install Citus
31+
RUN apt-get update \
32+
&& apt-get install -y --no-install-recommends \
33+
ca-certificates \
34+
curl \
35+
&& curl -s https://install.citusdata.com/community/deb.sh | bash
36+
RUN apt-get install -y postgresql-${PG_MAJOR}-citus-${CITUS_MAJOR_VERSION}=${CITUS_VERSION}.citus-${FANCY} \
37+
postgresql-$PG_MAJOR-hll=${HLL_VERSION} \
38+
postgresql-$PG_MAJOR-topn=${TOPN_VERSION} \
39+
&& apt-get purge -y --auto-remove curl \
40+
&& rm -rf /var/lib/apt/lists/*12
41+
42+
43+
44+
ARG POSTGRES_HOME=/var/lib/postgresql/
45+
ENV PATH=${PATH}:/usr/lib/postgresql/${PG_MAJOR}/bin:${POSTGRES_HOME}
46+
47+
WORKDIR ${POSTGRES_HOME}
48+
49+
RUN mkdir citus && chown postgres citus
50+
51+
USER postgres
52+
RUN cd ~ && initdb -D citus && echo "shared_preload_libraries = 'citus'" >> citus/postgresql.conf
53+
54+
USER root
55+
# Install python 3.8 and its dependencies
56+
RUN apt-get install -y build-essential \
57+
libcurl4-openssl-dev \
58+
libssl-dev \
59+
zlib1g-dev \
60+
curl \
61+
libffi-dev \
62+
gnupg2 && \
63+
curl https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tgz --output Python-3.8.12.tgz &&\
64+
tar xvf Python-3.8.12.tgz &&\
65+
cd Python-3.8.*/ && \
66+
./configure --enable-optimizations && \
67+
make altinstall && \
68+
python3.8 -m pip install pip-tools
69+
70+
COPY scripts/* ./
71+
72+
RUN pip-compile && python3.8 -m pip install -r requirements.txt
73+
74+
USER postgres
75+
76+
WORKDIR ${POSTGRES_HOME}
77+
78+
CMD ["test_internal.sh"]

0 commit comments

Comments
 (0)