Skip to content

Commit 4ed6d09

Browse files
markgoddardAlex-Welsh
authored andcommitted
DNM: Slim CI, pin sot_version
1 parent b92a9f2 commit 4ed6d09

File tree

2 files changed

+4
-90
lines changed

2 files changed

+4
-90
lines changed

.github/workflows/stackhpc-pull-request.yml

Lines changed: 2 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ concurrency:
77
name: Pull request
88
'on':
99
pull_request:
10+
# FIXME: Remove
11+
push:
1012
jobs:
1113
# Detect which files have changed and use this to run jobs conditionally.
1214
# Note that we can't use the workflow-level paths attribute since this
@@ -143,92 +145,3 @@ jobs:
143145
if: ${{ needs.check-changes.outputs.aio == 'true' }}
144146
secrets: inherit
145147
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
146-
147-
all-in-one-ubuntu-jammy-ovn:
148-
name: aio (Ubuntu Jammy OVN)
149-
needs:
150-
- check-changes
151-
- build-kayobe-image
152-
uses: ./.github/workflows/stackhpc-all-in-one.yml
153-
with:
154-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
155-
os_distribution: ubuntu
156-
os_release: jammy
157-
ssh_username: ubuntu
158-
neutron_plugin: ovn
159-
OS_CLOUD: openstack
160-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
161-
secrets: inherit
162-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
163-
164-
all-in-one-rocky-9-ovs:
165-
name: aio (Rocky 9 OVS)
166-
needs:
167-
- check-changes
168-
- build-kayobe-image
169-
uses: ./.github/workflows/stackhpc-all-in-one.yml
170-
with:
171-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
172-
os_distribution: rocky
173-
os_release: "9"
174-
ssh_username: cloud-user
175-
neutron_plugin: ovs
176-
OS_CLOUD: openstack
177-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
178-
secrets: inherit
179-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
180-
181-
all-in-one-rocky-9-ovn:
182-
name: aio (Rocky 9 OVN)
183-
needs:
184-
- check-changes
185-
- build-kayobe-image
186-
uses: ./.github/workflows/stackhpc-all-in-one.yml
187-
with:
188-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
189-
os_distribution: rocky
190-
os_release: "9"
191-
ssh_username: cloud-user
192-
neutron_plugin: ovn
193-
OS_CLOUD: openstack
194-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
195-
secrets: inherit
196-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
197-
198-
# Test two upgrade scenarios: Ubuntu Jammy OVS and Rocky 9 OVN.
199-
200-
all-in-one-upgrade-ubuntu-jammy-ovs:
201-
name: aio upgrade (Ubuntu Jammy OVS)
202-
needs:
203-
- check-changes
204-
- build-kayobe-image
205-
uses: ./.github/workflows/stackhpc-all-in-one.yml
206-
with:
207-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
208-
os_distribution: ubuntu
209-
os_release: jammy
210-
ssh_username: ubuntu
211-
neutron_plugin: ovs
212-
OS_CLOUD: openstack
213-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
214-
upgrade: true
215-
secrets: inherit
216-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
217-
218-
all-in-one-upgrade-rocky-9-ovn:
219-
name: aio upgrade (Rocky 9 OVN)
220-
needs:
221-
- check-changes
222-
- build-kayobe-image
223-
uses: ./.github/workflows/stackhpc-all-in-one.yml
224-
with:
225-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
226-
os_distribution: rocky
227-
os_release: "9"
228-
ssh_username: cloud-user
229-
neutron_plugin: ovn
230-
OS_CLOUD: openstack
231-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
232-
upgrade: true
233-
secrets: inherit
234-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

etc/kayobe/ansible/stackhpc-openstack-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
vars:
1010
sot_venv: "{{ virtualenv_path }}/sot-venv"
1111
sot_repo: "https://github.com/stackhpc/stackhpc-openstack-tests"
12-
sot_version: "v0.0.1"
12+
# FIXME
13+
sot_version: "docker-selinux"
1314
sot_timeout: 30
1415
results_path_local: "{{ lookup('env', 'HOME') }}/sot-results"
1516
tasks:

0 commit comments

Comments
 (0)