curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-8789: make python package installation consistent 

## Summary

The previous changes regarding python's distribution which broke CI the installation of python packages.

Python packages in cfsetup are now installed via virtual environment. The dependency python3-venv was added as builddep to allow the creation of venv and the python packages installation was moved to the post-cache resulting in the removal of 

* anchor build_release_pre_cache
* anchor component_test_pre_cache

Closes TUN-8789
This commit is contained in:
Luis Neto 2024-12-09 08:52:48 -08:00
parent 588ab7ebaa
commit 12d878531c
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
cfsetup.yaml
View File

@ -47,16 +47,17 @@ bullseye: &bullseye
- python3-pip - python3-pip
- python3-setuptools - python3-setuptools
- wget - wget
pre-cache: &build_release_pre_cache - python3-venv
- python3 -m pip install pynacl==1.4.0 pygithub==1.55 boto3==1.22.9 python-gnupg==0.4.9
post-cache: post-cache:
- python3 -m venv env
- . /cfsetup_build/env/bin/activate
- pip install pynacl==1.4.0 pygithub==1.55 boto3==1.22.9 python-gnupg==0.4.9
# build all packages (except macos and FIPS) and move them to /cfsetup/built_artifacts # build all packages (except macos and FIPS) and move them to /cfsetup/built_artifacts
- ./build-packages.sh - ./build-packages.sh
# handle FIPS separately so that we built with gofips compiler # handle FIPS separately so that we built with gofips compiler
build-linux-fips-release: build-linux-fips-release:
build_dir: *build_dir build_dir: *build_dir
builddeps: *build_deps_release builddeps: *build_deps_release
pre-cache: *build_release_pre_cache
post-cache: post-cache:
# same logic as above, but for FIPS packages only # same logic as above, but for FIPS packages only
- ./build-packages-fips.sh - ./build-packages-fips.sh
@ -131,12 +132,14 @@ bullseye: &bullseye
# libmsi and libgcab are libraries the wixl binary depends on. # libmsi and libgcab are libraries the wixl binary depends on.
- libmsi-dev - libmsi-dev
- libgcab-dev - libgcab-dev
- python3-venv
pre-cache: pre-cache:
- wget https://github.com/sudarshan-reddy/msitools/releases/download/v0.101b/wixl -P /usr/local/bin - wget https://github.com/sudarshan-reddy/msitools/releases/download/v0.101b/wixl -P /usr/local/bin
- chmod a+x /usr/local/bin/wixl - chmod a+x /usr/local/bin/wixl
- pip3 install pynacl==1.4.0
- pip3 install pygithub==1.55
post-cache: post-cache:
- python3 -m venv env
- . env/bin/activate
- pip install pynacl==1.4.0 pygithub==1.55
- .teamcity/package-windows.sh - .teamcity/package-windows.sh
test: test:
build_dir: *build_dir build_dir: *build_dir
@ -177,11 +180,13 @@ bullseye: &bullseye
# because the init script uses ps pid to determine if the agent is # because the init script uses ps pid to determine if the agent is
# running # running
- procps - procps
- python3-venv
pre-cache-copy-paths: pre-cache-copy-paths:
- component-tests/requirements.txt - component-tests/requirements.txt
pre-cache: &component_test_pre_cache
- python3 -m pip install --break-system-packages --upgrade -r component-tests/requirements.txt
post-cache: &component_test_post_cache post-cache: &component_test_post_cache
- python3 -m venv env
- . env/bin/activate
- pip install --upgrade -r component-tests/requirements.txt
# Creates and routes a Named Tunnel for this build. Also constructs # Creates and routes a Named Tunnel for this build. Also constructs
# config file from env vars. # config file from env vars.
- python3 component-tests/setup.py --type create - python3 component-tests/setup.py --type create
@ -193,7 +198,6 @@ bullseye: &bullseye
builddeps: *build_deps_component_test builddeps: *build_deps_component_test
pre-cache-copy-paths: pre-cache-copy-paths:
- component-tests/requirements.txt - component-tests/requirements.txt
pre-cache: *component_test_pre_cache
post-cache: *component_test_post_cache post-cache: *component_test_post_cache
github-release-dryrun: github-release-dryrun:
build_dir: *build_dir build_dir: *build_dir
@ -204,9 +208,11 @@ bullseye: &bullseye
- libffi-dev - libffi-dev
- python3-setuptools - python3-setuptools
- python3-pip - python3-pip
pre-cache: - python3-venv
- python3 -m pip install pynacl==1.4.0 pygithub==1.55
post-cache: post-cache:
- python3 -m venv env
- . env/bin/activate
- pip install pynacl==1.4.0 pygithub==1.55
- make github-release-dryrun - make github-release-dryrun
github-release: github-release:
build_dir: *build_dir build_dir: *build_dir
@ -217,9 +223,11 @@ bullseye: &bullseye
- libffi-dev - libffi-dev
- python3-setuptools - python3-setuptools
- python3-pip - python3-pip
pre-cache: - python3-venv
- python3 -m pip install pynacl==1.4.0 pygithub==1.55
post-cache: post-cache:
- python3 -m venv env
- . env/bin/activate
- pip install pynacl==1.4.0 pygithub==1.55
- make github-release - make github-release
r2-linux-release: r2-linux-release:
build_dir: *build_dir build_dir: *build_dir
@ -236,9 +244,11 @@ bullseye: &bullseye
- python3-pip - python3-pip
- reprepro - reprepro
- createrepo - createrepo
pre-cache: - python3-venv
- python3 -m pip install pynacl==1.4.0 pygithub==1.55 boto3==1.22.9 python-gnupg==0.4.9
post-cache: post-cache:
- python3 -m venv env
- . env/bin/activate
- pip install pynacl==1.4.0 pygithub==1.55 boto3==1.22.9 python-gnupg==0.4.9
- make r2-linux-release - make r2-linux-release
bookworm: *bullseye bookworm: *bullseye