slim down matrix and stop installing things (testing)

fix/packing-ci
Nils Dijk 2023-11-10 12:56:59 +00:00
parent cba3ea1d0e
commit 0ec43fb951
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
2 changed files with 17 additions and 25 deletions

View File

@ -25,10 +25,6 @@ pyenv versions
pyenv virtualenv ${PACKAGING_PYTHON_VERSION} packaging_env pyenv virtualenv ${PACKAGING_PYTHON_VERSION} packaging_env
pyenv activate packaging_env pyenv activate packaging_env
git clone -b v0.8.27 --depth=1 https://github.com/citusdata/tools.git tools
python3 -m pip install -r tools/packaging_automation/requirements.txt
echo "Package type: ${package_type}" echo "Package type: ${package_type}"
echo "OS version: $(get_rpm_os_version)" echo "OS version: $(get_rpm_os_version)"

View File

@ -47,22 +47,24 @@ jobs:
# For this reason, we need to use a "matrix" to generate names of # For this reason, we need to use a "matrix" to generate names of
# rpm images, e.g. citus/packaging:centos-7-pg12 # rpm images, e.g. citus/packaging:centos-7-pg12
packaging_docker_image: packaging_docker_image:
- oraclelinux-8 # - oraclelinux-8
- almalinux-8 # - almalinux-8
- almalinux-9 - almalinux-9
POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }} # POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }}
POSTGRES_VERSION:
- 16
# Postgres removed support for CentOS 7 in PG 16. Below block is needed to # Postgres removed support for CentOS 7 in PG 16. Below block is needed to
# keep the build for CentOS 7 working for PG 14 and PG 15. # keep the build for CentOS 7 working for PG 14 and PG 15.
# Once dependent systems drop support for Centos 7, we can remove this block. # Once dependent systems drop support for Centos 7, we can remove this block.
include: include:
- packaging_docker_image: centos-7 # - packaging_docker_image: centos-7
POSTGRES_VERSION: 14 # POSTGRES_VERSION: 14
- packaging_docker_image: centos-7 # - packaging_docker_image: centos-7
POSTGRES_VERSION: 15 # POSTGRES_VERSION: 15
- packaging_docker_image: oraclelinux-7 # - packaging_docker_image: oraclelinux-7
POSTGRES_VERSION: 14 # POSTGRES_VERSION: 14
- packaging_docker_image: oraclelinux-7 # - packaging_docker_image: oraclelinux-7
POSTGRES_VERSION: 15 # POSTGRES_VERSION: 15
container: container:
image: citus/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} image: citus/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }}
@ -112,10 +114,6 @@ jobs:
PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }} PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }}
run: | run: |
echo "Postgres version: ${POSTGRES_VERSION}" echo "Postgres version: ${POSTGRES_VERSION}"
## Install required packages to execute packaging tools for rpm based distros
python3 -m pip install wheel
./.github/packaging/validate_build_output.sh "rpm" ./.github/packaging/validate_build_output.sh "rpm"
deb_build_tests: deb_build_tests:
@ -132,10 +130,10 @@ jobs:
# for each deb based image and we use POSTGRES_VERSION to set # for each deb based image and we use POSTGRES_VERSION to set
# PG_CONFIG variable in each of those runs. # PG_CONFIG variable in each of those runs.
packaging_docker_image: packaging_docker_image:
- debian-buster-all # - debian-buster-all
- debian-bookworm-all # - debian-bookworm-all
- debian-bullseye-all # - debian-bullseye-all
- ubuntu-focal-all # - ubuntu-focal-all
- ubuntu-jammy-all - ubuntu-jammy-all
POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }} POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }}
@ -191,8 +189,6 @@ jobs:
PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }} PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }}
run: | run: |
echo "Postgres version: ${POSTGRES_VERSION}" echo "Postgres version: ${POSTGRES_VERSION}"
apt-get update -y
## Install required packages to execute packaging tools for deb based distros ## Install required packages to execute packaging tools for deb based distros
apt-get purge -y python3-yaml apt-get purge -y python3-yaml
./.github/packaging/validate_build_output.sh "deb" ./.github/packaging/validate_build_output.sh "deb"