From cba3ea1d0e902ea1ea47bdab06d6b28aa5c40051 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 00:08:13 +0000 Subject: [PATCH 1/9] use packaing test images and not install things during CI --- .github/workflows/packaging-test-pipelines.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml index 51bd82503..2df3da6e3 100644 --- a/.github/workflows/packaging-test-pipelines.yml +++ b/.github/workflows/packaging-test-pipelines.yml @@ -65,7 +65,7 @@ jobs: POSTGRES_VERSION: 15 container: - image: citus/packaging:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} + image: citus/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} options: --user root steps: @@ -114,7 +114,6 @@ jobs: echo "Postgres version: ${POSTGRES_VERSION}" ## Install required packages to execute packaging tools for rpm based distros - yum install python3-pip python3-devel postgresql-devel -y python3 -m pip install wheel ./.github/packaging/validate_build_output.sh "rpm" @@ -142,7 +141,7 @@ jobs: POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }} container: - image: citus/packaging:${{ matrix.packaging_docker_image }} + image: citus/packaging-test:${{ matrix.packaging_docker_image }} options: --user root steps: @@ -195,6 +194,5 @@ jobs: apt-get update -y ## Install required packages to execute packaging tools for deb based distros - apt-get install python3-dev python3-pip -y apt-get purge -y python3-yaml ./.github/packaging/validate_build_output.sh "deb" From 0ec43fb951daf6af082fb7dba59147e3930b109d Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 12:56:59 +0000 Subject: [PATCH 2/9] slim down matrix and stop installing things (testing) --- .github/packaging/validate_build_output.sh | 4 -- .../workflows/packaging-test-pipelines.yml | 38 +++++++++---------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.github/packaging/validate_build_output.sh b/.github/packaging/validate_build_output.sh index 64098811e..e136e8dea 100755 --- a/.github/packaging/validate_build_output.sh +++ b/.github/packaging/validate_build_output.sh @@ -25,10 +25,6 @@ pyenv versions pyenv virtualenv ${PACKAGING_PYTHON_VERSION} 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 "OS version: $(get_rpm_os_version)" diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml index 2df3da6e3..82d9554ab 100644 --- a/.github/workflows/packaging-test-pipelines.yml +++ b/.github/workflows/packaging-test-pipelines.yml @@ -47,22 +47,24 @@ jobs: # For this reason, we need to use a "matrix" to generate names of # rpm images, e.g. citus/packaging:centos-7-pg12 packaging_docker_image: - - oraclelinux-8 - - almalinux-8 + # - oraclelinux-8 + # - almalinux-8 - 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 # 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. include: - - packaging_docker_image: centos-7 - POSTGRES_VERSION: 14 - - packaging_docker_image: centos-7 - POSTGRES_VERSION: 15 - - packaging_docker_image: oraclelinux-7 - POSTGRES_VERSION: 14 - - packaging_docker_image: oraclelinux-7 - POSTGRES_VERSION: 15 + # - packaging_docker_image: centos-7 + # POSTGRES_VERSION: 14 + # - packaging_docker_image: centos-7 + # POSTGRES_VERSION: 15 + # - packaging_docker_image: oraclelinux-7 + # POSTGRES_VERSION: 14 + # - packaging_docker_image: oraclelinux-7 + # POSTGRES_VERSION: 15 container: image: citus/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} @@ -112,10 +114,6 @@ jobs: PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }} run: | 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" deb_build_tests: @@ -132,10 +130,10 @@ jobs: # for each deb based image and we use POSTGRES_VERSION to set # PG_CONFIG variable in each of those runs. packaging_docker_image: - - debian-buster-all - - debian-bookworm-all - - debian-bullseye-all - - ubuntu-focal-all + # - debian-buster-all + # - debian-bookworm-all + # - debian-bullseye-all + # - ubuntu-focal-all - ubuntu-jammy-all POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }} @@ -191,8 +189,6 @@ jobs: PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }} run: | echo "Postgres version: ${POSTGRES_VERSION}" - - apt-get update -y ## Install required packages to execute packaging tools for deb based distros apt-get purge -y python3-yaml ./.github/packaging/validate_build_output.sh "deb" From 54c1ba422feaf0e91f9ec0cddbc1d5222ff20f4c Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 13:31:12 +0000 Subject: [PATCH 3/9] skip rpm --- .../workflows/packaging-test-pipelines.yml | 142 +++++++++--------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml index 82d9554ab..0ee261b36 100644 --- a/.github/workflows/packaging-test-pipelines.yml +++ b/.github/workflows/packaging-test-pipelines.yml @@ -35,86 +35,86 @@ jobs: # Below line is needed to set the output variable to be used in the next job echo "pg_versions=${pg_versions_array}" >> $GITHUB_OUTPUT shell: bash - rpm_build_tests: - name: rpm_build_tests - needs: get_postgres_versions_from_file - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - # While we use separate images for different Postgres versions in rpm - # based distros - # For this reason, we need to use a "matrix" to generate names of - # rpm images, e.g. citus/packaging:centos-7-pg12 - packaging_docker_image: - # - oraclelinux-8 - # - almalinux-8 - - almalinux-9 - # 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 - # 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. - include: - # - packaging_docker_image: centos-7 - # POSTGRES_VERSION: 14 - # - packaging_docker_image: centos-7 - # POSTGRES_VERSION: 15 - # - packaging_docker_image: oraclelinux-7 - # POSTGRES_VERSION: 14 - # - packaging_docker_image: oraclelinux-7 - # POSTGRES_VERSION: 15 + # rpm_build_tests: + # name: rpm_build_tests + # needs: get_postgres_versions_from_file + # runs-on: ubuntu-latest + # strategy: + # fail-fast: false + # matrix: + # # While we use separate images for different Postgres versions in rpm + # # based distros + # # For this reason, we need to use a "matrix" to generate names of + # # rpm images, e.g. citus/packaging:centos-7-pg12 + # packaging_docker_image: + # - oraclelinux-8 + # - almalinux-8 + # - almalinux-9 + # # 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 + # # 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. + # include: + # - packaging_docker_image: centos-7 + # POSTGRES_VERSION: 14 + # - packaging_docker_image: centos-7 + # POSTGRES_VERSION: 15 + # - packaging_docker_image: oraclelinux-7 + # POSTGRES_VERSION: 14 + # - packaging_docker_image: oraclelinux-7 + # POSTGRES_VERSION: 15 - container: - image: citus/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} - options: --user root + # container: + # image: ghcr.io/citusdata/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} + # options: --user root - steps: - - name: Checkout repository - uses: actions/checkout@v3 + # steps: + # - name: Checkout repository + # uses: actions/checkout@v3 - - name: Set Postgres and python parameters for rpm based distros - run: | - echo "/usr/pgsql-${{ matrix.POSTGRES_VERSION }}/bin" >> $GITHUB_PATH - echo "/root/.pyenv/bin:$PATH" >> $GITHUB_PATH - echo "PACKAGING_PYTHON_VERSION=3.8.16" >> $GITHUB_ENV + # - name: Set Postgres and python parameters for rpm based distros + # run: | + # echo "/usr/pgsql-${{ matrix.POSTGRES_VERSION }}/bin" >> $GITHUB_PATH + # echo "/root/.pyenv/bin:$PATH" >> $GITHUB_PATH + # echo "PACKAGING_PYTHON_VERSION=3.8.16" >> $GITHUB_ENV - - name: Configure - run: | - echo "Current Shell:$0" - echo "GCC Version: $(gcc --version)" - ./configure 2>&1 | tee output.log + # - name: Configure + # run: | + # echo "Current Shell:$0" + # echo "GCC Version: $(gcc --version)" + # ./configure 2>&1 | tee output.log - - name: Make clean - run: | - make clean + # - name: Make clean + # run: | + # make clean - - name: Make - run: | - git config --global --add safe.directory ${GITHUB_WORKSPACE} - make CFLAGS="-Wno-missing-braces" -sj$(cat /proc/cpuinfo | grep "core id" | wc -l) 2>&1 | tee -a output.log + # - name: Make + # run: | + # git config --global --add safe.directory ${GITHUB_WORKSPACE} + # make CFLAGS="-Wno-missing-braces" -sj$(cat /proc/cpuinfo | grep "core id" | wc -l) 2>&1 | tee -a output.log - # Check the exit code of the make command - make_exit_code=${PIPESTATUS[0]} + # # Check the exit code of the make command + # make_exit_code=${PIPESTATUS[0]} - # If the make command returned a non-zero exit code, exit with the same code - if [[ $make_exit_code -ne 0 ]]; then - echo "make command failed with exit code $make_exit_code" - exit $make_exit_code - fi + # # If the make command returned a non-zero exit code, exit with the same code + # if [[ $make_exit_code -ne 0 ]]; then + # echo "make command failed with exit code $make_exit_code" + # exit $make_exit_code + # fi - - name: Make install - run: | - make CFLAGS="-Wno-missing-braces" install 2>&1 | tee -a output.log + # - name: Make install + # run: | + # make CFLAGS="-Wno-missing-braces" install 2>&1 | tee -a output.log - - name: Validate output - env: - POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }} - PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }} - run: | - echo "Postgres version: ${POSTGRES_VERSION}" - ./.github/packaging/validate_build_output.sh "rpm" + # - name: Validate output + # env: + # POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }} + # PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }} + # run: | + # echo "Postgres version: ${POSTGRES_VERSION}" + # ./.github/packaging/validate_build_output.sh "rpm" deb_build_tests: name: deb_build_tests @@ -139,7 +139,7 @@ jobs: POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }} container: - image: citus/packaging-test:${{ matrix.packaging_docker_image }} + image: ghcr.io/citusdata/packaging-test:${{ matrix.packaging_docker_image }} options: --user root steps: From f5e37bf6682a4190c097fcca134343de68f1774f Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 13:45:35 +0000 Subject: [PATCH 4/9] add root of tools to python path --- .github/packaging/validate_build_output.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/packaging/validate_build_output.sh b/.github/packaging/validate_build_output.sh index e136e8dea..310d0fb5e 100755 --- a/.github/packaging/validate_build_output.sh +++ b/.github/packaging/validate_build_output.sh @@ -34,6 +34,7 @@ if [[ ${package_type} == "rpm" && $(get_rpm_os_version) == 7* ]]; then python3 -m pip install 'urllib3<2' fi +export PYTHONPATH=/ python3 -m tools.packaging_automation.validate_build_output --output_file output.log \ --ignore_file .github/packaging/packaging_ignore.yml \ --package_type ${package_type} From 5b08955290d1b8f6da661df217b052ac475a14fd Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 14:18:15 +0000 Subject: [PATCH 5/9] activate already existing environment --- .github/packaging/validate_build_output.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/packaging/validate_build_output.sh b/.github/packaging/validate_build_output.sh index 310d0fb5e..084beb4a5 100755 --- a/.github/packaging/validate_build_output.sh +++ b/.github/packaging/validate_build_output.sh @@ -21,8 +21,6 @@ GITHUB_HOME="${HOME}" export HOME="/root" eval "$(pyenv init -)" -pyenv versions -pyenv virtualenv ${PACKAGING_PYTHON_VERSION} packaging_env pyenv activate packaging_env echo "Package type: ${package_type}" From 96802f9f73f16db8fa4364b34d2d696fd62a0960 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 14:42:22 +0000 Subject: [PATCH 6/9] add oraclelinux-7-pg15 --- .github/packaging/validate_build_output.sh | 6 - .../workflows/packaging-test-pipelines.yml | 140 +++++++++--------- 2 files changed, 70 insertions(+), 76 deletions(-) diff --git a/.github/packaging/validate_build_output.sh b/.github/packaging/validate_build_output.sh index 084beb4a5..7e792a0ab 100755 --- a/.github/packaging/validate_build_output.sh +++ b/.github/packaging/validate_build_output.sh @@ -26,12 +26,6 @@ pyenv activate packaging_env echo "Package type: ${package_type}" echo "OS version: $(get_rpm_os_version)" - # if os version is centos 7 or oracle linux 7, then remove urllib3 with pip uninstall and install urllib3<2.0.0 with pip install -if [[ ${package_type} == "rpm" && $(get_rpm_os_version) == 7* ]]; then - python3 -m pip uninstall -y urllib3 - python3 -m pip install 'urllib3<2' -fi - export PYTHONPATH=/ python3 -m tools.packaging_automation.validate_build_output --output_file output.log \ --ignore_file .github/packaging/packaging_ignore.yml \ diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml index 0ee261b36..3e530320b 100644 --- a/.github/workflows/packaging-test-pipelines.yml +++ b/.github/workflows/packaging-test-pipelines.yml @@ -35,86 +35,86 @@ jobs: # Below line is needed to set the output variable to be used in the next job echo "pg_versions=${pg_versions_array}" >> $GITHUB_OUTPUT shell: bash - # rpm_build_tests: - # name: rpm_build_tests - # needs: get_postgres_versions_from_file - # runs-on: ubuntu-latest - # strategy: - # fail-fast: false - # matrix: - # # While we use separate images for different Postgres versions in rpm - # # based distros - # # For this reason, we need to use a "matrix" to generate names of - # # rpm images, e.g. citus/packaging:centos-7-pg12 - # packaging_docker_image: - # - oraclelinux-8 - # - almalinux-8 - # - almalinux-9 - # # 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 - # # 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. - # include: - # - packaging_docker_image: centos-7 - # POSTGRES_VERSION: 14 - # - packaging_docker_image: centos-7 - # POSTGRES_VERSION: 15 - # - packaging_docker_image: oraclelinux-7 - # POSTGRES_VERSION: 14 - # - packaging_docker_image: oraclelinux-7 - # POSTGRES_VERSION: 15 + rpm_build_tests: + name: rpm_build_tests + needs: get_postgres_versions_from_file + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + # While we use separate images for different Postgres versions in rpm + # based distros + # For this reason, we need to use a "matrix" to generate names of + # rpm images, e.g. citus/packaging:centos-7-pg12 + # packaging_docker_image: + # - oraclelinux-8 + # - almalinux-8 + # - almalinux-9 + # 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 + # 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. + include: + # - packaging_docker_image: centos-7 + # POSTGRES_VERSION: 14 + # - packaging_docker_image: centos-7 + # POSTGRES_VERSION: 15 + # - packaging_docker_image: oraclelinux-7 + # POSTGRES_VERSION: 14 + - packaging_docker_image: oraclelinux-7 + POSTGRES_VERSION: 15 - # container: - # image: ghcr.io/citusdata/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} - # options: --user root + container: + image: ghcr.io/citusdata/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} + options: --user root - # steps: - # - name: Checkout repository - # uses: actions/checkout@v3 + steps: + - name: Checkout repository + uses: actions/checkout@v3 - # - name: Set Postgres and python parameters for rpm based distros - # run: | - # echo "/usr/pgsql-${{ matrix.POSTGRES_VERSION }}/bin" >> $GITHUB_PATH - # echo "/root/.pyenv/bin:$PATH" >> $GITHUB_PATH - # echo "PACKAGING_PYTHON_VERSION=3.8.16" >> $GITHUB_ENV + - name: Set Postgres and python parameters for rpm based distros + run: | + echo "/usr/pgsql-${{ matrix.POSTGRES_VERSION }}/bin" >> $GITHUB_PATH + echo "/root/.pyenv/bin:$PATH" >> $GITHUB_PATH + echo "PACKAGING_PYTHON_VERSION=3.8.16" >> $GITHUB_ENV - # - name: Configure - # run: | - # echo "Current Shell:$0" - # echo "GCC Version: $(gcc --version)" - # ./configure 2>&1 | tee output.log + - name: Configure + run: | + echo "Current Shell:$0" + echo "GCC Version: $(gcc --version)" + ./configure 2>&1 | tee output.log - # - name: Make clean - # run: | - # make clean + - name: Make clean + run: | + make clean - # - name: Make - # run: | - # git config --global --add safe.directory ${GITHUB_WORKSPACE} - # make CFLAGS="-Wno-missing-braces" -sj$(cat /proc/cpuinfo | grep "core id" | wc -l) 2>&1 | tee -a output.log + - name: Make + run: | + git config --global --add safe.directory ${GITHUB_WORKSPACE} + make CFLAGS="-Wno-missing-braces" -sj$(cat /proc/cpuinfo | grep "core id" | wc -l) 2>&1 | tee -a output.log - # # Check the exit code of the make command - # make_exit_code=${PIPESTATUS[0]} + # Check the exit code of the make command + make_exit_code=${PIPESTATUS[0]} - # # If the make command returned a non-zero exit code, exit with the same code - # if [[ $make_exit_code -ne 0 ]]; then - # echo "make command failed with exit code $make_exit_code" - # exit $make_exit_code - # fi + # If the make command returned a non-zero exit code, exit with the same code + if [[ $make_exit_code -ne 0 ]]; then + echo "make command failed with exit code $make_exit_code" + exit $make_exit_code + fi - # - name: Make install - # run: | - # make CFLAGS="-Wno-missing-braces" install 2>&1 | tee -a output.log + - name: Make install + run: | + make CFLAGS="-Wno-missing-braces" install 2>&1 | tee -a output.log - # - name: Validate output - # env: - # POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }} - # PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }} - # run: | - # echo "Postgres version: ${POSTGRES_VERSION}" - # ./.github/packaging/validate_build_output.sh "rpm" + - name: Validate output + env: + POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }} + PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }} + run: | + echo "Postgres version: ${POSTGRES_VERSION}" + ./.github/packaging/validate_build_output.sh "rpm" deb_build_tests: name: deb_build_tests From ab1010bcdbfbcb4f51ca356d7a453f6128a0dfbd Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 14:52:34 +0000 Subject: [PATCH 7/9] run full matrix again --- .../workflows/packaging-test-pipelines.yml | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml index 3e530320b..e035a3a36 100644 --- a/.github/workflows/packaging-test-pipelines.yml +++ b/.github/workflows/packaging-test-pipelines.yml @@ -46,25 +46,21 @@ jobs: # based distros # For this reason, we need to use a "matrix" to generate names of # rpm images, e.g. citus/packaging:centos-7-pg12 - # packaging_docker_image: - # - oraclelinux-8 - # - almalinux-8 - # - almalinux-9 - # POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }} - # POSTGRES_VERSION: - # - 16 + packaging_docker_image: + - centos-7 + - oraclelinux-7 + - oraclelinux-8 + - almalinux-8 + - almalinux-9 + POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }} # 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. # Once dependent systems drop support for Centos 7, we can remove this block. - include: - # - packaging_docker_image: centos-7 - # POSTGRES_VERSION: 14 - # - packaging_docker_image: centos-7 - # POSTGRES_VERSION: 15 - # - packaging_docker_image: oraclelinux-7 - # POSTGRES_VERSION: 14 + exclude: + - packaging_docker_image: centos-7 + POSTGRES_VERSION: 16 - packaging_docker_image: oraclelinux-7 - POSTGRES_VERSION: 15 + POSTGRES_VERSION: 16 container: image: ghcr.io/citusdata/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} @@ -130,10 +126,10 @@ jobs: # for each deb based image and we use POSTGRES_VERSION to set # PG_CONFIG variable in each of those runs. packaging_docker_image: - # - debian-buster-all - # - debian-bookworm-all - # - debian-bullseye-all - # - ubuntu-focal-all + - debian-buster-all + - debian-bookworm-all + - debian-bullseye-all + - ubuntu-focal-all - ubuntu-jammy-all POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }} From 2fe982d06c9507cf0e528591426de913b85d25d5 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 14:59:19 +0000 Subject: [PATCH 8/9] remove package removal during validation --- .github/workflows/packaging-test-pipelines.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/packaging-test-pipelines.yml b/.github/workflows/packaging-test-pipelines.yml index e035a3a36..ff9598b50 100644 --- a/.github/workflows/packaging-test-pipelines.yml +++ b/.github/workflows/packaging-test-pipelines.yml @@ -185,6 +185,4 @@ jobs: PACKAGING_DOCKER_IMAGE: ${{ matrix.packaging_docker_image }} run: | echo "Postgres version: ${POSTGRES_VERSION}" - ## Install required packages to execute packaging tools for deb based distros - apt-get purge -y python3-yaml ./.github/packaging/validate_build_output.sh "deb" From a35702334a412ff1e3201d271461f1a68c346218 Mon Sep 17 00:00:00 2001 From: Nils Dijk Date: Fri, 10 Nov 2023 15:00:14 +0000 Subject: [PATCH 9/9] remove rpm based debugging stuff --- .github/packaging/validate_build_output.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/packaging/validate_build_output.sh b/.github/packaging/validate_build_output.sh index 7e792a0ab..68b635f9b 100755 --- a/.github/packaging/validate_build_output.sh +++ b/.github/packaging/validate_build_output.sh @@ -2,17 +2,6 @@ set -ex -# Function to get the OS version -get_rpm_os_version() { - if [[ -f /etc/centos-release ]]; then - cat /etc/centos-release | awk '{print $4}' - elif [[ -f /etc/oracle-release ]]; then - cat /etc/oracle-release | awk '{print $5}' - else - echo "Unknown" - fi -} - package_type=${1} # Since $HOME is set in GH_Actions as /github/home, pyenv fails to create virtualenvs. @@ -24,7 +13,6 @@ eval "$(pyenv init -)" pyenv activate packaging_env echo "Package type: ${package_type}" -echo "OS version: $(get_rpm_os_version)" export PYTHONPATH=/ python3 -m tools.packaging_automation.validate_build_output --output_file output.log \