From 6a44f8101ed2bbb730473a4baa63a523fcb21695 Mon Sep 17 00:00:00 2001 From: Amelia Crate <95060558+a-crate@users.noreply.github.com> Date: Mon, 2 Dec 2024 18:09:58 +0000 Subject: [PATCH] Move rocky accelerator images to linux-image-build (#1317) --- .../pipelines/linux-image-build-dev.jsonnet | 34 ++---------------- concourse/pipelines/linux-image-build.jsonnet | 35 ++++++++++++++++--- 2 files changed, 33 insertions(+), 36 deletions(-) diff --git a/concourse/pipelines/linux-image-build-dev.jsonnet b/concourse/pipelines/linux-image-build-dev.jsonnet index a9e12c870..bf36dbab9 100644 --- a/concourse/pipelines/linux-image-build-dev.jsonnet +++ b/concourse/pipelines/linux-image-build-dev.jsonnet @@ -380,10 +380,6 @@ local imggroup = { { local almalinux_images = ['almalinux-9-arm64'], - local rocky_linux_accelerator_images = [ - 'rocky-linux-8-optimized-gcp-nvidia-latest', - 'rocky-linux-9-optimized-gcp-nvidia-latest', - ], // Start of output. resource_types: [ @@ -409,14 +405,11 @@ local imggroup = { ] + [common.gcsimgresource { image: image, gcs_dir: 'almalinux' } for image in almalinux_images] + [common.gcssbomresource { image: image, sbom_destination: 'almalinux' } for image in almalinux_images] + - [common.gcsshasumresource { image: image, shasum_destination: 'almalinux' } for image in almalinux_images] + - [common.gcsimgresource { image: image, gcs_dir: 'rocky-linux' } for image in rocky_linux_accelerator_images] + - [common.gcssbomresource { image: image, sbom_destination: 'rocky-linux' } for image in rocky_linux_accelerator_images] + - [common.gcsshasumresource { image: image, shasum_destination: 'rocky-linux' } for image in rocky_linux_accelerator_images], + [common.gcsshasumresource { image: image, shasum_destination: 'almalinux' } for image in almalinux_images], jobs: [ // EL build jobs elimgbuildjob { image: image } - for image in almalinux_images + rocky_linux_accelerator_images + for image in almalinux_images ] + [ // AlmaLinux publish jobs @@ -428,29 +421,8 @@ local imggroup = { } for env in envs for image in almalinux_images - ] + - [ - // Accelerator publish jobs - imgpublishjob { - image: image, - env: env, - gcs_dir: 'rocky-linux', - workflow_dir: 'enterprise_linux', - # Add accelerator tests - extra_test_tasks: [ - common.imagetesttask { - task: 'accelerator-tests', - filter: '^(acceleratorrdma|acceleratorconfig)$', - project: 'compute-image-test-pool-001', - test_projects: 'compute-image-test-pool-001', - extra_args:: [ '-compute_endpoint_override=https://www.googleapis.com/compute/alpha/', '-use_reservations=true', '-reservation_urls=projects/compute-image-test-pool-001/reservations/guestos-a3u-gsc' ], - }, - ], - } - for env in envs - for image in rocky_linux_accelerator_images ], groups: [ - imggroup { name: 'test_images', images: rocky_linux_accelerator_images + almalinux_images }, + imggroup { name: 'test_images', images: almalinux_images }, ], } diff --git a/concourse/pipelines/linux-image-build.jsonnet b/concourse/pipelines/linux-image-build.jsonnet index 70ec96239..954086488 100644 --- a/concourse/pipelines/linux-image-build.jsonnet +++ b/concourse/pipelines/linux-image-build.jsonnet @@ -443,6 +443,10 @@ local imggroup = { 'rocky-linux-9-optimized-gcp', 'rocky-linux-9-optimized-gcp-arm64', ], + local rocky_linux_accelerator_images = [ + 'rocky-linux-8-optimized-gcp-nvidia-latest', + 'rocky-linux-9-optimized-gcp-nvidia-latest', + ], // Start of output. resource_types: [ @@ -469,9 +473,9 @@ local imggroup = { [common.gcsimgresource { image: image, gcs_dir: 'almalinux' } for image in almalinux_images] + [common.gcssbomresource { image: image, sbom_destination: 'almalinux' } for image in almalinux_images] + [common.gcsshasumresource { image: image, shasum_destination: 'almalinux' } for image in almalinux_images] + - [common.gcsimgresource { image: image, gcs_dir: 'rocky-linux' } for image in rocky_linux_images] + - [common.gcssbomresource { image: image, sbom_destination: 'rocky-linux' } for image in rocky_linux_images] + - [common.gcsshasumresource { image: image, shasum_destination: 'rocky-linux' } for image in rocky_linux_images] + + [common.gcsimgresource { image: image, gcs_dir: 'rocky-linux' } for image in rocky_linux_images + rocky_linux_accelerator_images ] + + [common.gcssbomresource { image: image, sbom_destination: 'rocky-linux' } for image in rocky_linux_images + rocky_linux_accelerator_images] + + [common.gcsshasumresource { image: image, shasum_destination: 'rocky-linux' } for image in rocky_linux_images + rocky_linux_accelerator_images] + [ common.gcsimgresource { image: image, @@ -506,7 +510,7 @@ local imggroup = { [ // EL build jobs elimgbuildjob { image: image } - for image in rhel_images + centos_images + almalinux_images + rocky_linux_images + for image in rhel_images + centos_images + almalinux_images + rocky_linux_images + rocky_linux_accelerator_images ] + [ // Debian publish jobs @@ -565,6 +569,27 @@ local imggroup = { } for env in envs for image in rocky_linux_images + ] + + [ + // Accelerator publish jobs + imgpublishjob { + image: image, + env: env, + gcs_dir: 'rocky-linux', + workflow_dir: 'enterprise_linux', + # Add accelerator tests + extra_test_tasks: [ + common.imagetesttask { + task: 'accelerator-tests', + filter: '^(acceleratorrdma|acceleratorconfig)$', + project: 'compute-image-test-pool-001', + test_projects: 'compute-image-test-pool-001', + extra_args:: [ '-compute_endpoint_override=https://www.googleapis.com/compute/alpha/', '-use_reservations=true', '-reservation_urls=guestos-a3u-gsc' ], + }, + ], + } + for env in envs + for image in rocky_linux_accelerator_images ], groups: [ imggroup { name: 'debian', images: debian_images }, @@ -574,6 +599,6 @@ local imggroup = { }, imggroup { name: 'centos', images: centos_images }, imggroup { name: 'almalinux', images: almalinux_images }, - imggroup { name: 'rocky-linux', images: rocky_linux_images}, + imggroup { name: 'rocky-linux', images: rocky_linux_images + rocky_linux_accelerator_images}, ], }