Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/azure-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ jobs:
runs-on: >-
${{
github.repository_owner == 'AlmaLinux' &&
format('runs-on={0}/family=a1.metal/image=almalinux-9-aarch64', github.run_id)
format('runs-on={0}/family=a1.metal/image=almalinux-9-aarch64/volume=40g', github.run_id)
||
github.run_id
}}
Expand Down
39 changes: 35 additions & 4 deletions .github/workflows/gcp-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,11 @@ jobs:

# Optional: build cloud-image-tests from a user-supplied git repo+ref and
# publish a docker tarball as an artifact. All test jobs `needs:` this; when
# cit_git_repo is empty this job is skipped, which GitHub Actions treats as
# non-blocking (skipped != failed), so test jobs run as today.
# cit_git_repo is empty this job is skipped. A skipped need is only
# non-blocking for jobs with NO custom `if` (e.g. test-gcp-initialtest). Jobs
# with a custom `if` (the per-shape jobs) get an implicit success() prepended,
# which DOES treat a skipped need as failure — so those jobs use !cancelled()
# + an explicit needs.test-gcp-initialtest.result check instead.
build-cit:
name: Build cloud-image-tests from source
if: inputs.cit_git_repo != ''
Expand Down Expand Up @@ -134,6 +137,16 @@ jobs:
test-gcp-initialtest:
name: AlmaLinux ${{ inputs.image_override || format('{0} {1}', inputs.version_major, matrix.arch) }} Initial Tests
needs: [init-data, build-cit]
# A skipped needed job skips its dependents by default, even without a
# custom `if`. build-cit is skipped whenever cit_git_repo is empty, which
# would otherwise skip this job (and everything that needs it). !cancelled()
# overrides that propagation; we then require init-data to have succeeded
# and accept build-cit as either succeeded or skipped (only a real build
# failure should block).
if: >-
!cancelled()
&& needs.init-data.result == 'success'
&& (needs.build-cit.result == 'success' || needs.build-cit.result == 'skipped')
permissions:
id-token: write
contents: read
Expand Down Expand Up @@ -200,7 +213,16 @@ jobs:
id-token: write
contents: read
runs-on: "${{ github.repository_owner == 'AlmaLinux' && format('runs-on={0}/runner=2cpu-linux-x64/spot=false/volume=100g/image=almalinux-10-x86_64', github.run_id) || 'ubuntu-24.04' }}"
if: inputs.arch == 'ALL' || inputs.arch == 'x86_64'
# A custom job-level `if` makes GitHub implicitly prepend success(), which
# returns false when ANY needs job is skipped — and build-cit IS skipped
# whenever cit_git_repo is empty, which would wrongly skip every shape.
# The !cancelled() status function suppresses that implicit success(); we
# then gate explicitly on test-gcp-initialtest so a failed smoke test still
# blocks, while build-cit's skipped/success state is intentionally ignored.
if: >-
!cancelled()
&& needs.test-gcp-initialtest.result == 'success'
&& (inputs.arch == 'ALL' || inputs.arch == 'x86_64')
timeout-minutes: 720
strategy:
fail-fast: false
Expand Down Expand Up @@ -344,7 +366,16 @@ jobs:
id-token: write
contents: read
runs-on: ubuntu-24.04
if: inputs.arch == 'ALL' || inputs.arch == 'aarch64'
# A custom job-level `if` makes GitHub implicitly prepend success(), which
# returns false when ANY needs job is skipped — and build-cit IS skipped
# whenever cit_git_repo is empty, which would wrongly skip every shape.
# The !cancelled() status function suppresses that implicit success(); we
# then gate explicitly on test-gcp-initialtest so a failed smoke test still
# blocks, while build-cit's skipped/success state is intentionally ignored.
if: >-
!cancelled()
&& needs.test-gcp-initialtest.result == 'success'
&& (inputs.arch == 'ALL' || inputs.arch == 'aarch64')
timeout-minutes: 720
strategy:
fail-fast: false
Expand Down