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

Removes unnecessary package installations in packaging pipelines (#7341) 

With the recent changes in packaging images, linux package installations
to execute validate_output is unnecessary now.
In this PR, I removed them to make the pipeline more effective.

- [x] Remove the test warning before merge

(cherry picked from commit 32b0fc23f5)
pull/7588/head
Gürkan İndibay 2023-11-17 08:51:56 +03:00 committed by Jelte Fennema-Nio
parent 40e9e2614d
commit 75ff237340
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,10 @@ 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)"
# 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 # For RHEL 7, we need to install urllib3<2 due to below execution error
# ImportError: urllib3 v2.0 only supports OpenSSL 1.1.1+, currently the 'ssl'
# module is compiled with 'OpenSSL 1.0.2k-fips 26 Jan 2017'.
# See: https://github.com/urllib3/urllib3/issues/2168
if [[ ${package_type} == "rpm" && $(get_rpm_os_version) == 7* ]]; then if [[ ${package_type} == "rpm" && $(get_rpm_os_version) == 7* ]]; then
python3 -m pip uninstall -y urllib3 python3 -m pip uninstall -y urllib3
python3 -m pip install 'urllib3<2' python3 -m pip install 'urllib3<2'

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

@ -111,11 +111,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
yum install python3-pip python3-devel postgresql-devel -y || true
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:
@ -191,9 +186,4 @@ 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
apt-get install python3-dev python3-pip -y
apt-get purge -y python3-yaml
./.github/packaging/validate_build_output.sh "deb" ./.github/packaging/validate_build_output.sh "deb"