From 78a41fd43e4907e5f7c96456739a33051f698877 Mon Sep 17 00:00:00 2001 From: James Jerger <35977367+jjerger@users.noreply.github.com> Date: Tue, 19 Nov 2024 09:27:25 -0800 Subject: [PATCH] Remove unreleased images from prod pipeline (#1306) * Remove unreleased images from prod pipeline Moved them over to the dev pipeline which was forked from this pipeline * Revert centos removal We will want to keep this one here --- concourse/pipelines/linux-image-build.jsonnet | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/concourse/pipelines/linux-image-build.jsonnet b/concourse/pipelines/linux-image-build.jsonnet index 055ebae60..3f3044884 100644 --- a/concourse/pipelines/linux-image-build.jsonnet +++ b/concourse/pipelines/linux-image-build.jsonnet @@ -389,7 +389,7 @@ local imggroup = { }; { - local almalinux_images = ['almalinux-8', 'almalinux-9', 'almalinux-9-arm64'], + local almalinux_images = ['almalinux-8', 'almalinux-9'], local debian_images = ['debian-11', 'debian-12', 'debian-12-arm64'], local centos_images = ['centos-stream-9', 'centos-stream-9-arm64'], local rhel_sap_images = [ @@ -427,10 +427,6 @@ local imggroup = { 'rocky-linux-9-optimized-gcp', 'rocky-linux-9-optimized-gcp-arm64', ], - local rocky_accelerator_images = [ - 'rocky-linux-8-optimized-gcp-nvidia-latest', - 'rocky-linux-9-optimized-gcp-nvidia-latest', - ], // Start of output. resource_types: [ @@ -457,9 +453,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 + rocky_accelerator_images] + - [common.gcssbomresource { image: image, sbom_destination: 'rocky-linux' } for image in rocky_linux_images + rocky_accelerator_images] + - [common.gcsshasumresource { image: image, shasum_destination: 'rocky-linux' } for image in rocky_linux_images + rocky_accelerator_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, @@ -494,7 +490,7 @@ local imggroup = { [ // EL build jobs elimgbuildjob { image: image } - for image in rhel_images + centos_images + almalinux_images + rocky_linux_images + rocky_accelerator_images + for image in rhel_images + centos_images + almalinux_images + rocky_linux_images ] + [ // Debian publish jobs @@ -543,19 +539,6 @@ 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', - // Acceleratorconfig test disabled until nictype is updated - //additionalcitsuites: 'acceleratorconfig', - } - for env in envs - for image in rocky_accelerator_images - ] + [ // Rocky Linux publish jobs imgpublishjob { @@ -575,6 +558,6 @@ local imggroup = { }, imggroup { name: 'centos', images: centos_images }, imggroup { name: 'almalinux', images: almalinux_images }, - imggroup { name: 'rocky-linux', images: rocky_linux_images + rocky_accelerator_images }, + imggroup { name: 'rocky-linux', images: rocky_linux_images}, ], }