Skip to content

Commit 2b2370c

Browse files
Improve conditionals
Co-authored-by: Alex Welsh <alex@stackhpc.com>
1 parent 0bcb1ff commit 2b2370c

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

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

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,7 @@ jobs:
332332
run: |
333333
echo "Builds failed. See workflow artifacts for details." &&
334334
exit 1
335-
if: steps.build_rocky_9.outcome == 'failure' ||
336-
steps.build_ubuntu_noble.outcome == 'failure'
335+
if: steps.build_rocky_9.outcome == 'failure'
337336

338337
- name: Upload logs artifact
339338
uses: actions/upload-artifact@v4
@@ -596,8 +595,7 @@ jobs:
596595
run: |
597596
echo "Builds failed. See workflow artifacts for details." &&
598597
exit 1
599-
if: steps.build_rocky_9.outcome == 'failure' ||
600-
steps.build_ubuntu_noble.outcome == 'failure'
598+
if: steps.build_ubuntu_noble.outcome == 'failure'
601599

602600
- name: Upload logs artifact
603601
uses: actions/upload-artifact@v4
@@ -804,7 +802,7 @@ jobs:
804802
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
805803
if: steps.build_rocky_9_arm64.outcome == 'failure'
806804

807-
- name: Upload Rocky Linux 9 overcloud host image to Ark
805+
- name: Upload Rocky Linux 9 ARM64 overcloud host image to Ark
808806
run: |
809807
source venvs/kayobe/bin/activate &&
810808
source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -820,7 +818,7 @@ jobs:
820818
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
821819
if: inputs.rocky9 && steps.build_rocky_9_arm64.outcome == 'success'
822820

823-
- name: Upload Rocky Linux 9 overcloud host image to current Dev Cloud (SMS/Leafcloud)
821+
- name: Upload Rocky Linux 9 ARM64 overcloud host image to current Dev Cloud (SMS/Leafcloud)
824822
run: |
825823
source venvs/kayobe/bin/activate &&
826824
source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -834,7 +832,7 @@ jobs:
834832
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
835833
if: inputs.rocky9 && steps.build_rocky_9_arm64.outcome == 'success'
836834

837-
- name: Upload Rocky Linux 9 overcloud host image to other Dev Cloud (Leafcloud/SMS)
835+
- name: Upload Rocky Linux 9 ARM64 overcloud host image to other Dev Cloud (Leafcloud/SMS)
838836
run: |
839837
source venvs/kayobe/bin/activate &&
840838
source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -860,8 +858,7 @@ jobs:
860858
run: |
861859
echo "Builds failed. See workflow artifacts for details." &&
862860
exit 1
863-
if: steps.build_rocky_9_arm64.outcome == 'failure' ||
864-
steps.build_ubuntu_noble_arm64.outcome == 'failure'
861+
if: steps.build_rocky_9_arm64.outcome == 'failure'
865862

866863
- name: Upload logs artifact
867864
uses: actions/upload-artifact@v4
@@ -1084,7 +1081,7 @@ jobs:
10841081
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
10851082
if: inputs.ubuntu-noble && steps.build_ubuntu_noble_arm64.outcome == 'success'
10861083

1087-
- name: Upload Ubuntu Noble overcloud host image to current Dev Cloud (SMS/Leafcloud)
1084+
- name: Upload Ubuntu Noble ARM64 overcloud host image to current Dev Cloud (SMS/Leafcloud)
10881085
run: |
10891086
source venvs/kayobe/bin/activate &&
10901087
source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -1098,7 +1095,7 @@ jobs:
10981095
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
10991096
if: inputs.ubuntu-noble && steps.build_ubuntu_noble_arm64.outcome == 'success'
11001097

1101-
- name: Upload Ubuntu Noble overcloud host image to other Dev Cloud (Leafcloud/SMS)
1098+
- name: Upload Ubuntu Noble ARM64 overcloud host image to other Dev Cloud (Leafcloud/SMS)
11021099
run: |
11031100
source venvs/kayobe/bin/activate &&
11041101
source src/kayobe-config/kayobe-env --environment ci-builder &&
@@ -1124,8 +1121,7 @@ jobs:
11241121
run: |
11251122
echo "Builds failed. See workflow artifacts for details." &&
11261123
exit 1
1127-
if: steps.build_rocky_9_arm64.outcome == 'failure' ||
1128-
steps.build_ubuntu_noble_arm64.outcome == 'failure'
1124+
if: steps.build_ubuntu_noble_arm64.outcome == 'failure'
11291125

11301126
- name: Upload logs artifact
11311127
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)