Skip to content

Commit d9c3e65

Browse files
authored
Merge branch 'stackhpc/yoga' into update/seed-pulp-3.43.1
2 parents 78c3257 + 4837c8d commit d9c3e65

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+857
-152
lines changed

.github/workflows/overcloud-host-image-build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
runs-on: [self-hosted, stackhpc-kayobe-config-kolla-builder]
4343
permissions: {}
4444
steps:
45-
- uses: actions/checkout@v3
45+
- uses: actions/checkout@v4
4646
with:
4747
path: src/kayobe-config
4848

@@ -67,7 +67,7 @@ jobs:
6767
rm -f /tmp/updated_images.txt
6868
6969
- name: Clone StackHPC Kayobe repository
70-
uses: actions/checkout@v3
70+
uses: actions/checkout@v4
7171
with:
7272
repository: stackhpc/kayobe
7373
ref: refs/heads/stackhpc/${{ steps.openstack_release.outputs.openstack_release }}
@@ -362,7 +362,7 @@ jobs:
362362
if: inputs.ubuntu-jammy && steps.build_ubuntu_jammy.outcome == 'success'
363363

364364
- name: Upload updated images artifact
365-
uses: actions/upload-artifact@v3
365+
uses: actions/upload-artifact@v4
366366
with:
367367
name: Updated images list
368368
path: /tmp/updated_images.txt
@@ -374,7 +374,7 @@ jobs:
374374
steps.build_ubuntu_jammy.outcome == 'success'
375375

376376
- name: Upload CentOS build logs if build failed
377-
uses: actions/upload-artifact@v3
377+
uses: actions/upload-artifact@v4
378378
with:
379379
name: CentOS build logs
380380
path: |
@@ -384,7 +384,7 @@ jobs:
384384
if: steps.build_centos_stream_8.outcome == 'failure'
385385

386386
- name: Upload Rocky 8 build logs if build failed
387-
uses: actions/upload-artifact@v3
387+
uses: actions/upload-artifact@v4
388388
with:
389389
name: Rocky 8 build logs
390390
path: |
@@ -394,7 +394,7 @@ jobs:
394394
if: steps.build_rocky_8.outcome == 'failure'
395395

396396
- name: Upload Rocky 9 build logs if build failed
397-
uses: actions/upload-artifact@v3
397+
uses: actions/upload-artifact@v4
398398
with:
399399
name: Rocky 9 build logs
400400
path: |
@@ -404,7 +404,7 @@ jobs:
404404
if: steps.build_rocky_9.outcome == 'failure'
405405

406406
- name: Upload Ubuntu Focal 20.04 build logs if build failed
407-
uses: actions/upload-artifact@v3
407+
uses: actions/upload-artifact@v4
408408
with:
409409
name: Ubuntu Focal 20.04 build logs
410410
path: |
@@ -414,7 +414,7 @@ jobs:
414414
if: steps.build_ubuntu_focal.outcome == 'failure'
415415

416416
- name: Upload Ubuntu Jammy 22.04 build logs if build failed
417-
uses: actions/upload-artifact@v3
417+
uses: actions/upload-artifact@v4
418418
with:
419419
name: Ubuntu Jammy 22.04 build logs
420420
path: |

.github/workflows/overcloud-host-image-promote.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
overcloud-host-image-promote:
3434
name: Promote overcloud host image
3535
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
36-
runs-on: [self-hosted, stackhpc-kayobe-config-kolla-builder]
36+
runs-on: ubuntu-22.04
3737
steps:
38-
- uses: actions/checkout@v3
38+
- uses: actions/checkout@v4
3939
with:
4040
path: src/kayobe-config
4141

@@ -44,9 +44,10 @@ jobs:
4444
run: |
4545
BRANCH=$(awk -F'=' '/defaultbranch/ {print $2}' .gitreview)
4646
echo "openstack_release=${BRANCH}" | sed "s|stable/||" >> $GITHUB_OUTPUT
47+
working-directory: src/kayobe-config
4748

4849
- name: Clone StackHPC Kayobe repository
49-
uses: actions/checkout@v3
50+
uses: actions/checkout@v4
5051
with:
5152
repository: stackhpc/kayobe
5253
ref: refs/heads/stackhpc/${{ steps.openstack_release.outputs.openstack_release }}

0 commit comments

Comments
 (0)