Skip to content

Commit 17931a4

Browse files
committed
Use env hooks to setup Pulp proxy in CI
Use the authenticating pulp_proxy for all CI build jobs that need packages from Ark - host images, Kolla images and the IPA image.
1 parent 133d5d1 commit 17931a4

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

.github/workflows/stackhpc-container-image-build.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,6 @@ jobs:
190190
localhost ansible_connection=local ansible_python_interpreter=/usr/bin/python3
191191
EOF
192192
193-
# See etc/kayobe/ansible/roles/pulp_auth_proxy/README.md for details.
194-
# NOTE: We override pulp_auth_proxy_conf_path to a path shared by the
195-
# runner and dind containers.
196-
- name: Deploy an authenticating package repository mirror proxy
197-
run: |
198-
source venvs/kayobe/bin/activate &&
199-
source src/kayobe-config/kayobe-env --environment ci-builder &&
200-
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/pulp-auth-proxy.yml -e pulp_auth_proxy_conf_path=/home/runner/_work/pulp_proxy
201-
env:
202-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
203-
204193
- name: Create build logs output directory
205194
run: mkdir image-build-logs
206195

@@ -222,6 +211,9 @@ jobs:
222211
args="$args -e stackhpc_repo_mirror_auth_proxy_enabled=true"
223212
args="$args -e kolla_build_log_path=$GITHUB_WORKSPACE/image-build-logs/kolla-build-overcloud.log"
224213
args="$args -e base_path=$GITHUB_WORKSPACE/opt/kayobe"
214+
# NOTE: We override pulp_auth_proxy_conf_path to a path shared by the
215+
# runner and dind containers.
216+
args="$args -e pulp_auth_proxy_conf_path=/home/runner/_work/pulp_proxy"
225217
source venvs/kayobe/bin/activate &&
226218
source src/kayobe-config/kayobe-env --environment ci-builder &&
227219
kayobe overcloud container image build $args
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../ansible/pulp-auth-proxy.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../ansible/pulp-auth-proxy.yml
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../ansible/pulp-auth-proxy.yml

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ kolla_build_neutron_ovs: true
3636
# Host and port of a package repository mirror.
3737
# Build against the development Pulp service repositories.
3838
# Use Ark's package repositories to install packages.
39+
stackhpc_repo_mirror_auth_proxy_enabled: true
3940
stackhpc_repo_mirror_url: "{{ stackhpc_repo_mirror_auth_proxy_url if stackhpc_repo_mirror_auth_proxy_enabled | bool else stackhpc_release_pulp_url }}"
4041
stackhpc_repo_mirror_username: "skc-ci-aio"
4142
stackhpc_repo_mirror_password: !vault |

0 commit comments

Comments
 (0)