File tree Expand file tree Collapse file tree 4 files changed +29
-10
lines changed Expand file tree Collapse file tree 4 files changed +29
-10
lines changed Original file line number Diff line number Diff line change 3232 ANSIBLE_FORCE_COLOR : True
3333 KAYOBE_ENVIRONMENT : ci-builder
3434 KAYOBE_VAULT_PASSWORD : ${{ secrets.KAYOBE_VAULT_PASSWORD }}
35+
3536jobs :
3637 runner-preqs :
3738 uses : ./.github/workflows/runs-on-preq.yml
@@ -207,7 +208,7 @@ jobs:
207208 source venvs/kayobe/bin/activate &&
208209 source src/kayobe-config/kayobe-env --environment ci-builder &&
209210 kayobe seed host command run \
210- --command "sudo apt update && sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv && sudo apt-get -y install btrfs-tools " --show-output
211+ --command "sudo apt update && sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv" --show-output
211212 env :
212213 KAYOBE_VAULT_PASSWORD : ${{ secrets.KAYOBE_VAULT_PASSWORD }}
213214
Original file line number Diff line number Diff line change 1414 description : Whether to run the workflow (workaround for required status checks issue)
1515 type : boolean
1616 default : true
17+ runner_env :
18+ required : false
19+ type : string
20+ description : ' Runner environment'
21+ default : ' SMS Lab'
1722 secrets :
1823 KAYOBE_VAULT_PASSWORD :
1924 required : true
2025
2126env :
2227 ANSIBLE_FORCE_COLOR : True
2328jobs :
29+ runner-preqs :
30+ uses : ./.github/workflows/runs-on-preq.yml
31+ with :
32+ runner_env : ${{ inputs.runner_env }}
33+
2434 check-tags :
2535 name : Check container image tags
2636 if : ${{ inputs.if && ! cancelled() }}
27- environment : SMS Lab
28- runs-on : ${{ vars.RUNS_ON_TARGET_AIO }}
37+ environment : ${{ inputs.runner_env }}
38+ runs-on : ${{ needs.runner-preqs.outputs.runner_name_aio }}
39+ needs :
40+ - runner-preqs
2941 permissions : {}
3042 env :
3143 KAYOBE_ENVIRONMENT : ci-aio
Original file line number Diff line number Diff line change @@ -139,6 +139,7 @@ jobs:
139139 os_release : jammy
140140 ssh_username : ubuntu
141141 neutron_plugin : ovs
142+ OS_CLOUD : openstack
142143 if : ${{ needs.check-changes.outputs.aio == 'true' }}
143144 secrets : inherit
144145 if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
@@ -155,6 +156,7 @@ jobs:
155156 os_release : jammy
156157 ssh_username : ubuntu
157158 neutron_plugin : ovn
159+ OS_CLOUD : openstack
158160 if : ${{ needs.check-changes.outputs.aio == 'true' }}
159161 secrets : inherit
160162 if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
@@ -171,6 +173,7 @@ jobs:
171173 os_release : " 9"
172174 ssh_username : cloud-user
173175 neutron_plugin : ovs
176+ OS_CLOUD : openstack
174177 if : ${{ needs.check-changes.outputs.aio == 'true' }}
175178 secrets : inherit
176179 if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
@@ -187,6 +190,7 @@ jobs:
187190 os_release : " 9"
188191 ssh_username : cloud-user
189192 neutron_plugin : ovn
193+ OS_CLOUD : openstack
190194 if : ${{ needs.check-changes.outputs.aio == 'true' }}
191195 secrets : inherit
192196 if : ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
@@ -205,6 +209,7 @@ jobs:
205209 os_release : jammy
206210 ssh_username : ubuntu
207211 neutron_plugin : ovs
212+ OS_CLOUD : openstack
208213 if : ${{ needs.check-changes.outputs.aio == 'true' }}
209214 upgrade : true
210215 secrets : inherit
@@ -222,6 +227,7 @@ jobs:
222227 os_release : " 9"
223228 ssh_username : cloud-user
224229 neutron_plugin : ovn
230+ OS_CLOUD : openstack
225231 if : ${{ needs.check-changes.outputs.aio == 'true' }}
226232 upgrade : true
227233 secrets : inherit
Original file line number Diff line number Diff line change 1919 patterns : " {{ file_regex }}"
2020 register : found_files
2121
22- - name : pip install packages
22+ - name : Install pip packages
2323 ansible.builtin.pip :
24- name :
25- - pyopenssl
26- - ndg-httpsclient
27- - pyasn1
28- - urllib3
29- state : present
24+ name :
25+ - pyopenssl
26+ - ndg-httpsclient
27+ - pyasn1
28+ - urllib3
29+ state : present
3030
3131 - name : Upload an artifact
3232 pulp.squeezer.artifact :
You can’t perform that action at this time.
0 commit comments