Skip to content

Commit 94a4974

Browse files
authored
Merge pull request #1483 from stackhpc/sync-upstream/master
Sync upstream master
2 parents 8968128 + 1aadc8e commit 94a4974

File tree

13 files changed

+290
-209
lines changed

13 files changed

+290
-209
lines changed

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

Lines changed: 178 additions & 178 deletions
Original file line numberDiff line numberDiff line change
@@ -8,58 +8,58 @@ name: Pull request
88
'on':
99
pull_request:
1010
jobs:
11-
# Detect which files have changed and use this to run jobs conditionally.
12-
# Note that we can't use the workflow-level paths attribute since this
13-
# would skip the workflow entirely, and would prevent us from making the
14-
# aio jobs required to pass (a skip counts as a pass).
15-
check-changes:
16-
runs-on: ubuntu-22.04
17-
permissions:
18-
pull-requests: read
19-
name: Check changed files
20-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
21-
outputs:
22-
aio: ${{ steps.changes.outputs.aio }}
23-
build-kayobe-image: ${{ steps.changes.outputs.build-kayobe-image }}
24-
check-tags: ${{ steps.changes.outputs.check-tags }}
25-
steps:
26-
- name: GitHub Checkout
27-
uses: actions/checkout@v4
28-
29-
- name: Check changed files
30-
uses: dorny/paths-filter@v3
31-
id: changes
32-
with:
33-
# Filters are defined in this file.
34-
filters: .github/path-filters.yml
35-
36-
tox:
37-
runs-on: ubuntu-22.04
38-
permissions: {}
39-
strategy:
40-
matrix:
41-
include:
42-
- environment: pep8
43-
python-version: "3.10"
44-
- environment: releasenotes
45-
python-version: "3.10"
46-
- environment: docs
47-
python-version: "3.10"
48-
name: Tox ${{ matrix.environment }} with Python ${{ matrix.python-version }}
49-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
50-
steps:
51-
- name: GitHub Checkout 🛎
52-
uses: actions/checkout@v4
53-
with:
54-
fetch-depth: 0
55-
- name: Setup Python ${{ matrix.python-version }} 🐍
56-
uses: actions/setup-python@v5
57-
with:
58-
python-version: ${{ matrix.python-version }}
59-
- name: Install Tox 📦
60-
run: pip install tox
61-
- name: Run Tox ${{ matrix.environment }} 🧪
62-
run: tox -e ${{ matrix.environment }}
11+
# # Detect which files have changed and use this to run jobs conditionally.
12+
# # Note that we can't use the workflow-level paths attribute since this
13+
# # would skip the workflow entirely, and would prevent us from making the
14+
# # aio jobs required to pass (a skip counts as a pass).
15+
# check-changes:
16+
# runs-on: ubuntu-22.04
17+
# permissions:
18+
# pull-requests: read
19+
# name: Check changed files
20+
# if: github.repository == 'stackhpc/stackhpc-kayobe-config'
21+
# outputs:
22+
# aio: ${{ steps.changes.outputs.aio }}
23+
# build-kayobe-image: ${{ steps.changes.outputs.build-kayobe-image }}
24+
# check-tags: ${{ steps.changes.outputs.check-tags }}
25+
# steps:
26+
# - name: GitHub Checkout
27+
# uses: actions/checkout@v4
28+
29+
# - name: Check changed files
30+
# uses: dorny/paths-filter@v3
31+
# id: changes
32+
# with:
33+
# # Filters are defined in this file.
34+
# filters: .github/path-filters.yml
35+
36+
# tox:
37+
# runs-on: ubuntu-22.04
38+
# permissions: {}
39+
# strategy:
40+
# matrix:
41+
# include:
42+
# - environment: pep8
43+
# python-version: "3.10"
44+
# - environment: releasenotes
45+
# python-version: "3.10"
46+
# - environment: docs
47+
# python-version: "3.10"
48+
# name: Tox ${{ matrix.environment }} with Python ${{ matrix.python-version }}
49+
# if: github.repository == 'stackhpc/stackhpc-kayobe-config'
50+
# steps:
51+
# - name: GitHub Checkout 🛎
52+
# uses: actions/checkout@v4
53+
# with:
54+
# fetch-depth: 0
55+
# - name: Setup Python ${{ matrix.python-version }} 🐍
56+
# uses: actions/setup-python@v5
57+
# with:
58+
# python-version: ${{ matrix.python-version }}
59+
# - name: Install Tox 📦
60+
# run: pip install tox
61+
# - name: Run Tox ${{ matrix.environment }} 🧪
62+
# run: tox -e ${{ matrix.environment }}
6363

6464
lint:
6565
runs-on: ubuntu-22.04
@@ -106,129 +106,129 @@ jobs:
106106
# when the parent jobs completed successfully or were skipped. We pass an
107107
# 'if' argument to the called workflow to allow running it conditionally.
108108

109-
build-kayobe-image:
110-
name: Build Kayobe Image
111-
needs:
112-
- check-changes
113-
uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
114-
with:
115-
if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
116-
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
117-
118-
check-tags:
119-
name: Check container image tags
120-
needs:
121-
- check-changes
122-
- build-kayobe-image
123-
uses: ./.github/workflows/stackhpc-check-tags.yml
124-
with:
125-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
126-
if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
127-
secrets: inherit
128-
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
129-
130-
all-in-one-ubuntu-jammy-ovs:
131-
name: aio (Ubuntu Jammy OVS)
132-
needs:
133-
- check-changes
134-
- build-kayobe-image
135-
uses: ./.github/workflows/stackhpc-all-in-one.yml
136-
with:
137-
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
138-
os_distribution: ubuntu
139-
os_release: jammy
140-
ssh_username: ubuntu
141-
neutron_plugin: ovs
142-
OS_CLOUD: openstack
143-
if: ${{ needs.check-changes.outputs.aio == 'true' }}
144-
secrets: inherit
145-
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' }}
109+
# build-kayobe-image:
110+
# name: Build Kayobe Image
111+
# needs:
112+
# - check-changes
113+
# uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
114+
# with:
115+
# if: ${{ needs.check-changes.outputs.build-kayobe-image == 'true' }}
116+
# if: github.repository == 'stackhpc/stackhpc-kayobe-config'
117+
118+
# check-tags:
119+
# name: Check container image tags
120+
# needs:
121+
# - check-changes
122+
# - build-kayobe-image
123+
# uses: ./.github/workflows/stackhpc-check-tags.yml
124+
# with:
125+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
126+
# if: ${{ needs.check-changes.outputs.check-tags == 'true' }}
127+
# secrets: inherit
128+
# if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
129+
130+
# all-in-one-ubuntu-jammy-ovs:
131+
# name: aio (Ubuntu Jammy OVS)
132+
# needs:
133+
# - check-changes
134+
# - build-kayobe-image
135+
# uses: ./.github/workflows/stackhpc-all-in-one.yml
136+
# with:
137+
# kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
138+
# os_distribution: ubuntu
139+
# os_release: jammy
140+
# ssh_username: ubuntu
141+
# neutron_plugin: ovs
142+
# OS_CLOUD: openstack
143+
# if: ${{ needs.check-changes.outputs.aio == 'true' }}
144+
# secrets: inherit
145+
# 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' }}

0 commit comments

Comments
 (0)