11pinned_go : &pinned_go go-boring=1.22.5-1
22
33build_dir : &build_dir /cfsetup_build
4- default-flavor : bullseye
5- buster : &buster
4+ default-flavor : bookworm
5+
6+ bullseye : &bullseye
67 build-linux :
78 build_dir : *build_dir
89 builddeps : &build_deps
@@ -31,8 +32,8 @@ buster: &buster
3132 builddeps : *build_deps
3233 pre-cache : *build_pre_cache
3334 post-cache :
34- - make cover
35- # except FIPS and macos
35+ - make cover
36+ # except FIPS and macos
3637 build-linux-release :
3738 build_dir : *build_dir
3839 builddeps : &build_deps_release
@@ -47,10 +48,7 @@ buster: &buster
4748 - python3-setuptools
4849 - wget
4950 pre-cache : &build_release_pre_cache
50- - pip3 install pynacl==1.4.0
51- - pip3 install pygithub==1.55
52- - pip3 install boto3==1.22.9
53- - pip3 install python-gnupg==0.4.9
51+ - python3 -m pip install pynacl==1.4.0 pygithub==1.55 boto3==1.22.9 python-gnupg==0.4.9
5452 post-cache :
5553 # build all packages (except macos and FIPS) and move them to /cfsetup/built_artifacts
5654 - ./build-packages.sh
@@ -110,7 +108,7 @@ buster: &buster
110108 - export GOOS=linux
111109 - export GOARCH=arm64
112110 - export NIGHTLY=true
113- # - export FIPS=true # TUN-7595
111+ # - export FIPS=true # TUN-7595
114112 - export ORIGINAL_NAME=true
115113 - make cloudflared-deb
116114 build-deb-arm64 :
@@ -172,18 +170,20 @@ buster: &buster
172170 build_dir : *build_dir
173171 builddeps : &build_deps_component_test
174172 - *pinned_go
175- - python3.7
173+ - python3
176174 - python3-pip
177175 - python3-setuptools
178- # procps installs the ps command which is needed in test_sysv_service because the init script
179- # uses ps pid to determine if the agent is running
176+ # procps installs the ps command which is needed in test_sysv_service
177+ # because the init script uses ps pid to determine if the agent is
178+ # running
180179 - procps
181180 pre-cache-copy-paths :
182181 - component-tests/requirements.txt
183182 pre-cache : &component_test_pre_cache
184- - sudo pip3 install --upgrade -r component-tests/requirements.txt
183+ - python3 -m pip install --break-system-packages --upgrade -r component-tests/requirements.txt
185184 post-cache : &component_test_post_cache
186- # Creates and routes a Named Tunnel for this build. Also constructs config file from env vars.
185+ # Creates and routes a Named Tunnel for this build. Also constructs
186+ # config file from env vars.
187187 - python3 component-tests/setup.py --type create
188188 - pytest component-tests -o log_cli=true --log-cli-level=INFO
189189 # The Named Tunnel is deleted and its route unprovisioned here.
@@ -205,8 +205,7 @@ buster: &buster
205205 - python3-setuptools
206206 - python3-pip
207207 pre-cache :
208- - pip3 install pynacl==1.4.0
209- - pip3 install pygithub==1.55
208+ - python3 -m pip install pynacl==1.4.0 pygithub==1.55
210209 post-cache :
211210 - make github-release-dryrun
212211 github-release :
@@ -219,8 +218,7 @@ buster: &buster
219218 - python3-setuptools
220219 - python3-pip
221220 pre-cache :
222- - pip3 install pynacl==1.4.0
223- - pip3 install pygithub==1.55
221+ - python3 -m pip install pynacl==1.4.0 pygithub==1.55
224222 post-cache :
225223 - make github-release
226224 r2-linux-release :
@@ -239,12 +237,9 @@ buster: &buster
239237 - reprepro
240238 - createrepo
241239 pre-cache :
242- - pip3 install pynacl==1.4.0
243- - pip3 install pygithub==1.55
244- - pip3 install boto3==1.22.9
245- - pip3 install python-gnupg==0.4.9
240+ - python3 -m pip install pynacl==1.4.0 pygithub==1.55 boto3==1.22.9 python-gnupg==0.4.9
246241 post-cache :
247242 - make r2-linux-release
248243
249- bullseye : *buster
250- bookworm : *buster
244+ bookworm : *bullseye
245+ trixie : *bullseye
0 commit comments