external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add oraclelinux-7-pg15

fix/packing-ci
Nils Dijk 2023-11-10 14:42:22 +00:00
parent 5b08955290
commit 96802f9f73
No known key found for this signature in database
GPG Key ID: CA1177EF9434F241
2 changed files with 70 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/packaging/validate_build_output.sh vendored
View File

@ -26,12 +26,6 @@ pyenv activate packaging_env
echo "Package type: ${package_type}" echo "Package type: ${package_type}"
echo "OS version: $(get_rpm_os_version)" 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=/ export PYTHONPATH=/
python3 -m tools.packaging_automation.validate_build_output --output_file output.log \ python3 -m tools.packaging_automation.validate_build_output --output_file output.log \
--ignore_file .github/packaging/packaging_ignore.yml \ --ignore_file .github/packaging/packaging_ignore.yml \

140
.github/workflows/packaging-test-pipelines.yml vendored
View File

@ -35,86 +35,86 @@ jobs:
# Below line is needed to set the output variable to be used in the next job # Below line is needed to set the output variable to be used in the next job
echo "pg_versions=${pg_versions_array}" >> $GITHUB_OUTPUT echo "pg_versions=${pg_versions_array}" >> $GITHUB_OUTPUT
shell: bash shell: bash
# rpm_build_tests: rpm_build_tests:
# name: rpm_build_tests name: rpm_build_tests
# needs: get_postgres_versions_from_file needs: get_postgres_versions_from_file
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# strategy: strategy:
# fail-fast: false fail-fast: false
# matrix: matrix:
# # While we use separate images for different Postgres versions in rpm # While we use separate images for different Postgres versions in rpm
# # based distros # based distros
# # 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: # POSTGRES_VERSION:
# - 16 # - 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: ghcr.io/citusdata/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }} image: ghcr.io/citusdata/packaging-test:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }}
# options: --user root options: --user root
# steps: steps:
# - name: Checkout repository - name: Checkout repository
# uses: actions/checkout@v3 uses: actions/checkout@v3
# - name: Set Postgres and python parameters for rpm based distros - name: Set Postgres and python parameters for rpm based distros
# run: | run: |
# echo "/usr/pgsql-${{ matrix.POSTGRES_VERSION }}/bin" >> $GITHUB_PATH echo "/usr/pgsql-${{ matrix.POSTGRES_VERSION }}/bin" >> $GITHUB_PATH
# echo "/root/.pyenv/bin:$PATH" >> $GITHUB_PATH echo "/root/.pyenv/bin:$PATH" >> $GITHUB_PATH
# echo "PACKAGING_PYTHON_VERSION=3.8.16" >> $GITHUB_ENV echo "PACKAGING_PYTHON_VERSION=3.8.16" >> $GITHUB_ENV
# - name: Configure - name: Configure
# run: | run: |
# echo "Current Shell:$0" echo "Current Shell:$0"
# echo "GCC Version: $(gcc --version)" echo "GCC Version: $(gcc --version)"
# ./configure 2>&1 | tee output.log ./configure 2>&1 | tee output.log
# - name: Make clean - name: Make clean
# run: | run: |
# make clean make clean
# - name: Make - name: Make
# run: | run: |
# git config --global --add safe.directory ${GITHUB_WORKSPACE} 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 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 # Check the exit code of the make command
# make_exit_code=${PIPESTATUS[0]} make_exit_code=${PIPESTATUS[0]}
# # If the make command returned a non-zero exit code, exit with the same code # If the make command returned a non-zero exit code, exit with the same code
# if [[ $make_exit_code -ne 0 ]]; then if [[ $make_exit_code -ne 0 ]]; then
# echo "make command failed with exit code $make_exit_code" echo "make command failed with exit code $make_exit_code"
# exit $make_exit_code exit $make_exit_code
# fi fi
# - name: Make install - name: Make install
# run: | run: |
# make CFLAGS="-Wno-missing-braces" install 2>&1 | tee -a output.log make CFLAGS="-Wno-missing-braces" install 2>&1 | tee -a output.log
# - name: Validate output - name: Validate output
# env: env:
# POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }} POSTGRES_VERSION: ${{ matrix.POSTGRES_VERSION }}
# 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}"
# ./.github/packaging/validate_build_output.sh "rpm" ./.github/packaging/validate_build_output.sh "rpm"
deb_build_tests: deb_build_tests:
name: deb_build_tests name: deb_build_tests