Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds el/9 ol/9 tests #367

Merged
merged 26 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
efcefa4
Adds el-ol/9 tests
gurkanindibay Jun 5, 2024
b299026
Adds el/9 el/9 defs
gurkanindibay Jun 5, 2024
7392aec
Fixes invalid key error
gurkanindibay Jun 5, 2024
d419116
Adds platforms
gurkanindibay Jun 5, 2024
357cf59
Fixes folder name
gurkanindibay Jun 5, 2024
d19c242
Updates almalinux docker header
gurkanindibay Jun 5, 2024
0371b71
Updates almalinux
gurkanindibay Jun 5, 2024
c1cf260
Adds direct packagecloud link
gurkanindibay Jun 5, 2024
a7aedc4
Adds raw gh link
gurkanindibay Jun 5, 2024
c89a836
Fixes release suffix
gurkanindibay Jun 5, 2024
0c8e709
removing centos7 and ol7 that are no longer supported
sedagundogdu Jul 30, 2024
b7949d9
almalinux-9 dockerfile url updated
sedagundogdu Aug 5, 2024
8ba8aae
Fixes release suffix ol-9
sedagundogdu Aug 5, 2024
6109288
enable epel repository and installing pygpgme - updating repo metadata
sedagundogdu Aug 5, 2024
b1f3246
install python3-gpg
sedagundogdu Aug 5, 2024
fb91d7b
removing pygpgme installation
sedagundogdu Aug 5, 2024
a90fc82
fixes python38-devel error
sedagundogdu Aug 5, 2024
c760a18
Fix python installation in Dockerfile
sedagundogdu Aug 5, 2024
ab96a54
using alternative method for python installation
sedagundogdu Aug 5, 2024
24f2848
try to fixes python38
sedagundogdu Aug 5, 2024
5870c4e
updated
sedagundogdu Aug 5, 2024
291d598
centos7 ol7 support removal and fixes release suffix ol-9
sedagundogdu Aug 6, 2024
8019db1
enable epel
sedagundogdu Aug 6, 2024
f3adbc1
updated python instalation
sedagundogdu Aug 6, 2024
3a4835d
added zlib-devel for installing
sedagundogdu Aug 6, 2024
a3c68d8
Update Dockerfile to fix python38-devel error for ol/9
sedagundogdu Aug 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/package-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ jobs:
matrix:
platform:
- centos/8
- centos/7
- ol/7
- el/9
- ol/9
- debian/buster
- debian/bullseye
- debian/bookworm
Expand Down
2 changes: 2 additions & 0 deletions packaging_automation/test_citus_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ def run_command(command: str) -> int:
class TestPlatform(Enum):
el_7 = {"name": "el/7", "docker_image_name": "el-7"}
el_8 = {"name": "el/8", "docker_image_name": "el-8"}
el_9 = {"name": "el/9", "docker_image_name": "almalinux-9"}
centos_8 = {"name": "centos/8", "docker_image_name": "centos-8"}
centos_7 = {"name": "centos/7", "docker_image_name": "centos-7"}
ol_7 = {"name": "ol/7", "docker_image_name": "ol-7"}
ol_8 = {"name": "ol/8", "docker_image_name": "ol-8"}
ol_9 = {"name": "ol/9", "docker_image_name": "ol-9"}
debian_stretch = {"name": "debian/stretch", "docker_image_name": "debian-stretch"}
debian_buster = {"name": "debian/buster", "docker_image_name": "debian-buster"}
debian_bullseye = {
Expand Down
63 changes: 63 additions & 0 deletions test-images/almalinux-9/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
FROM almalinux:9
ARG CITUS_VERSION
# Format should be XY and should not include dots e.g for 10.2.1=>102
ARG CITUS_MAJOR_VERSION
ARG PG_MAJOR
ARG FANCY=1
ARG HLL_VERSION=2.18.citus-1
ARG TOPN_VERSION=2.6.0.citus-1
ARG PACKAGE_RELEASE_SUFFIX=el9

ENV CITUS_VERSION ${CITUS_VERSION}

ENV PG_MAJOR ${PG_MAJOR}


RUN yum update -y


# TODO Parameterize Citus and postgres version
RUN export CITUS_MAJOR_VER=${CITUS_MAJOR_VERSION//./} && \
curl https://raw.githubusercontent.com/citusdata/packaging/gh-pages/community/rpm.sh | bash && \
yum install -y citus${CITUS_MAJOR_VER}_${PG_MAJOR}-${CITUS_VERSION}.citus-${FANCY}.${PACKAGE_RELEASE_SUFFIX} \
hll_${PG_MAJOR}-${HLL_VERSION}.${PACKAGE_RELEASE_SUFFIX} \
topn_${PG_MAJOR}-${TOPN_VERSION}.${PACKAGE_RELEASE_SUFFIX}


ARG POSTGRES_HOME=/var/lib/pgsql
ENV PATH=/usr/pgsql-${PG_MAJOR}/bin:${PATH}:${POSTGRES_HOME}

WORKDIR ${POSTGRES_HOME}

RUN mkdir citus && chown postgres citus





USER postgres
RUN cd ~ && initdb -D citus && echo "shared_preload_libraries = 'citus'" >> citus/postgresql.conf

USER root
# Enable EPEL repository and install dependencies for Python 3.8
RUN yum install -y epel-release && \
yum install -y gcc make libcurl-devel openssl-devel bzip2-devel libffi-devel xz-devel wget tar zlib-devel && \
wget https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tgz && \
tar xvf Python-3.8.12.tgz && \
cd Python-3.8.12 && \
./configure --enable-optimizations && \
make altinstall && \
python3.8 -m pip install pip-tools


COPY scripts/* ./

# Use pip-tools to compile and install requirements
RUN pip-compile && python3.8 -m pip install -r requirements.txt

USER postgres

WORKDIR ${POSTGRES_HOME}

CMD ["test_internal.sh"]

63 changes: 63 additions & 0 deletions test-images/ol-9/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
FROM oraclelinux:9

ARG CITUS_VERSION
# Format should be X.Y and should include dots e.g for 10.2.1=>10.2
ARG CITUS_MAJOR_VERSION
ARG PG_MAJOR
ARG FANCY=1
ARG HLL_VERSION=2.18.citus-1
ARG TOPN_VERSION=2.6.0.citus-1
ARG PACKAGE_RELEASE_SUFFIX=el9

ENV CITUS_VERSION ${CITUS_VERSION}

ENV PG_MAJOR ${PG_MAJOR}


RUN yum update -y && \
yum install -y curl


RUN export CITUS_MAJOR_VER=${CITUS_MAJOR_VERSION//./} && \
curl https://install.citusdata.com/community/rpm.sh | bash && \
yum install -y citus${CITUS_MAJOR_VER}_${PG_MAJOR}-${CITUS_VERSION}.citus-${FANCY}.${PACKAGE_RELEASE_SUFFIX} \
hll_${PG_MAJOR}-${HLL_VERSION}.${PACKAGE_RELEASE_SUFFIX} \
topn_${PG_MAJOR}-${TOPN_VERSION}.${PACKAGE_RELEASE_SUFFIX}

ARG POSTGRES_HOME=/var/lib/pgsql
ENV PATH=/usr/pgsql-${PG_MAJOR}/bin:${PATH}:${POSTGRES_HOME}

WORKDIR ${POSTGRES_HOME}

RUN mkdir citus && chown postgres citus

USER postgres
RUN cd ~ && initdb -D citus && echo "shared_preload_libraries = 'citus'" >> citus/postgresql.conf

USER root
# Install python 3.8 and its dependencies
RUN yum install -y gcc make && \
yum -y install libcurl-devel \
openssl-devel \
bzip2-devel \
libffi-devel \
xz-devel \
libzstd-devel \
zlib-devel &&\
curl https://www.python.org/ftp/python/3.8.12/Python-3.8.12.tgz --output Python-3.8.12.tgz &&\
tar xvf Python-3.8.12.tgz &&\
cd Python-3.8.*/ && \
./configure --enable-optimizations && \
make altinstall && \
python3.8 -m pip install pip-tools

COPY scripts/* ./

RUN pip-compile && python3.8 -m pip install -r requirements.txt


USER postgres

WORKDIR ${POSTGRES_HOME}

CMD ["test_internal.sh"]
Loading