Skip to content

Commit

Permalink
Update guest package release pipelines (#1212)
Browse files Browse the repository at this point in the history
Stop testing on RHEL/Centos 7 and Debian 10. Start testing on Debian 12 where that wasn't already happening. Stop uploading packages to debian 10 and centos 7 repositories.
  • Loading branch information
a-crate authored Jul 1, 2024
1 parent edb5e0c commit 57af909
Showing 1 changed file with 9 additions and 108 deletions.
117 changes: 9 additions & 108 deletions concourse/pipelines/guest-package-build.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ local build_guest_agent = buildpackagejob {
local tl = self,

uploads: [],
builds: ['deb10', 'deb11-arm64', 'el7', 'el8', 'el8-arm64', 'el9', 'el9-arm64', 'goo'],
builds: ['deb12', 'deb11-arm64', 'el8', 'el8-arm64', 'el9', 'el9-arm64', 'goo'],
// The guest agent has additional testing steps to build derivative images then run CIT against them.
extra_tasks: [
{
Expand All @@ -332,12 +332,6 @@ local build_guest_agent = buildpackagejob {
{
in_parallel: {
steps: [
buildpackageimagetask {
image_name: 'debian-10',
source_image: 'projects/debian-cloud/global/images/family/debian-10',
dest_image: 'debian-10-((.:build-id))',
gcs_package_path: 'gs://gcp-guest-package-uploads/%s/google-guest-agent_((.:package-version))-g1_amd64.deb' % [tl.package],
},
buildpackageimagetask {
image_name: 'debian-11',
source_image: 'projects/debian-cloud/global/images/family/debian-11',
Expand Down Expand Up @@ -366,18 +360,6 @@ local build_guest_agent = buildpackagejob {
machine_type: 't2a-standard-2',
worker_image: 'projects/compute-image-tools/global/images/family/debian-11-worker-arm64',
},
buildpackageimagetask {
image_name: 'centos-7',
source_image: 'projects/centos-cloud/global/images/family/centos-7',
dest_image: 'centos-7-((.:build-id))',
gcs_package_path: 'gs://gcp-guest-package-uploads/%s/google-guest-agent-((.:package-version))-g1.el7.x86_64.rpm' % [tl.package],
},
buildpackageimagetask {
image_name: 'rhel-7',
source_image: 'projects/rhel-cloud/global/images/family/rhel-7',
dest_image: 'rhel-7-((.:build-id))',
gcs_package_path: 'gs://gcp-guest-package-uploads/%s/google-guest-agent-((.:package-version))-g1.el7.x86_64.rpm' % [tl.package],
},
buildpackageimagetask {
image_name: 'rhel-8',
source_image: 'projects/rhel-cloud/global/images/family/rhel-8',
Expand Down Expand Up @@ -427,7 +409,7 @@ local build_guest_agent = buildpackagejob {
'-project=gcp-guest',
'-zone=us-central1-a',
'-test_projects=compute-image-test-pool-002,compute-image-test-pool-003,compute-image-test-pool-004,compute-image-test-pool-005',
'-images=projects/gcp-guest/global/images/debian-10-((.:build-id)),projects/gcp-guest/global/images/debian-11-((.:build-id)),projects/gcp-guest/global/images/debian-12-((.:build-id)),projects/gcp-guest/global/images/centos-7-((.:build-id)),projects/gcp-guest/global/images/rhel-7-((.:build-id)),projects/gcp-guest/global/images/rhel-8-((.:build-id)),projects/gcp-guest/global/images/rhel-9-((.:build-id))',
'-images=projects/gcp-guest/global/images/debian-11-((.:build-id)),projects/gcp-guest/global/images/debian-12-((.:build-id)),projects/gcp-guest/global/images/rhel-8-((.:build-id)),projects/gcp-guest/global/images/rhel-9-((.:build-id))',
'-exclude=(image)|(livemigrate)|(suspendresume)|(disk)|(security)|(oslogin)|(storageperf)|(networkperf)|(shapevalidation)|(hotattach)|(licensevalidation)',
'-parallel_count=15',
],
Expand Down Expand Up @@ -491,15 +473,6 @@ local build_and_upload_guest_agent = build_guest_agent {
reponame: 'google-guest-agent-bookworm',
sbom_file: 'gs://gcp-guest-package-uploads/guest-agent/google-guest-agent-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/guest-agent/google-guest-agent-((.:package-version))-g1.el7.x86_64.rpm"',
os_type: 'EL7_YUM',
pkg_inside_name: 'google-guest-agent',
pkg_name: 'guest-agent',
pkg_version: '((.:package-version))',
reponame: 'google-guest-agent-el7',
sbom_file: 'gs://gcp-guest-package-uploads/guest-agent/google-guest-agent-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/guest-agent/google-guest-agent-((.:package-version))-g1.el8.x86_64.rpm","gs://gcp-guest-package-uploads/guest-agent/google-guest-agent-((.:package-version))-g1.el8.aarch64.rpm"',
os_type: 'EL8_YUM',
Expand Down Expand Up @@ -557,7 +530,7 @@ local build_and_upload_guest_agent = build_guest_agent {
},
buildpackagejob {
package: 'guest-oslogin',
builds: ['deb10', 'deb11', 'deb11-arm64', 'deb12', 'deb12-arm64', 'el7', 'el8', 'el8-arm64', 'el9', 'el9-arm64'],
builds: ['deb11', 'deb11-arm64', 'deb12', 'deb12-arm64', 'el8', 'el8-arm64', 'el9', 'el9-arm64'],
gcs_dir: 'oslogin',
extra_tasks: [
{
Expand All @@ -584,12 +557,6 @@ local build_and_upload_guest_agent = build_guest_agent {
in_parallel: {
fail_fast: true,
steps: [
buildpackageimagetask {
image_name: 'debian-10',
source_image: 'projects/debian-cloud/global/images/family/debian-10',
dest_image: 'debian-10-((.:build-id))',
gcs_package_path: 'gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin_((.:package-version))-g1+deb10_amd64.deb',
},
buildpackageimagetask {
image_name: 'debian-11',
source_image: 'projects/debian-cloud/global/images/family/debian-11',
Expand Down Expand Up @@ -618,18 +585,6 @@ local build_and_upload_guest_agent = build_guest_agent {
machine_type: 't2a-standard-2',
worker_image: 'projects/compute-image-tools/global/images/family/debian-11-worker-arm64',
},
buildpackageimagetask {
image_name: 'centos-7',
source_image: 'projects/centos-cloud/global/images/family/centos-7',
dest_image: 'centos-7-((.:build-id))',
gcs_package_path: 'gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin-((.:package-version))-g1.el7.x86_64.rpm',
},
buildpackageimagetask {
image_name: 'rhel-7',
source_image: 'projects/rhel-cloud/global/images/family/rhel-7',
dest_image: 'rhel-7-((.:build-id))',
gcs_package_path: 'gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin-((.:package-version))-g1.el7.x86_64.rpm',
},
buildpackageimagetask {
image_name: 'rhel-8',
source_image: 'projects/rhel-cloud/global/images/family/rhel-8',
Expand Down Expand Up @@ -679,7 +634,7 @@ local build_and_upload_guest_agent = build_guest_agent {
'-project=gcp-guest',
'-zone=us-central1-a',
'-test_projects=oslogin-cit',
'-images=projects/gcp-guest/global/images/debian-10-((.:build-id)),projects/gcp-guest/global/images/debian-11-((.:build-id)),projects/gcp-guest/global/images/debian-12-((.:build-id)),projects/gcp-guest/global/images/centos-7-((.:build-id)),projects/gcp-guest/global/images/rhel-7-((.:build-id)),projects/gcp-guest/global/images/rhel-8-((.:build-id)),projects/gcp-guest/global/images/rhel-9-((.:build-id))',
'-images=projects/gcp-guest/global/images/debian-11-((.:build-id)),projects/gcp-guest/global/images/debian-12-((.:build-id)),projects/gcp-guest/global/images/rhel-8-((.:build-id)),projects/gcp-guest/global/images/rhel-9-((.:build-id))',
'-parallel_count=2',
'-filter=oslogin',
],
Expand Down Expand Up @@ -713,15 +668,6 @@ local build_and_upload_guest_agent = build_guest_agent {
},
],
uploads: [
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin_((.:package-version))-g1+deb10_amd64.deb"',
os_type: 'BUSTER_APT',
pkg_inside_name: 'google-compute-engine-oslogin',
pkg_name: 'guest-oslogin',
pkg_version: '((.:package-version))',
reponame: 'gce-google-compute-engine-oslogin-buster',
sbom_file: 'gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin_((.:package-version))-g1+deb11_amd64.deb","gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin_((.:package-version))-g1+deb11_arm64.deb"',
os_type: 'BULLSEYE_APT',
Expand All @@ -740,15 +686,6 @@ local build_and_upload_guest_agent = build_guest_agent {
reponame: 'gce-google-compute-engine-oslogin-bookworm',
sbom_file: 'gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin-((.:package-version))-g1.el7.x86_64.rpm"',
os_type: 'EL7_YUM',
pkg_inside_name: 'google-compute-engine-oslogin',
pkg_name: 'guest-oslogin',
pkg_version: '((.:package-version))',
reponame: 'gce-google-compute-engine-oslogin-el7',
sbom_file: 'gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin-((.:package-version))-g1.el8.x86_64.rpm","gs://gcp-guest-package-uploads/oslogin/google-compute-engine-oslogin-((.:package-version))-g1.el8.aarch64.rpm"',
os_type: 'EL8_YUM',
Expand All @@ -771,7 +708,7 @@ local build_and_upload_guest_agent = build_guest_agent {
},
buildpackagejob {
package: 'osconfig',
builds: ['deb10', 'deb11-arm64', 'el7', 'el8', 'el8-arm64', 'el9', 'el9-arm64', 'goo'],
builds: ['deb11-arm64', 'el8', 'el8-arm64', 'el9', 'el9-arm64', 'goo'],
uploads: [
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/osconfig/google-osconfig-agent_((.:package-version))-g1_amd64.deb"',
Expand Down Expand Up @@ -800,15 +737,6 @@ local build_and_upload_guest_agent = build_guest_agent {
reponame: 'google-osconfig-agent-bookworm',
sbom_file: 'gs://gcp-guest-package-uploads/osconfig/google-osconfig-agent-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/osconfig/google-osconfig-agent-((.:package-version))-g1.el7.x86_64.rpm"',
os_type: 'EL7_YUM',
pkg_inside_name: 'google-osconfig-agent',
pkg_name: 'google-osconfig-agent',
pkg_version: '((.:package-version))',
reponame: 'google-osconfig-agent-el7',
sbom_file: 'gs://gcp-guest-package-uploads/osconfig/google-osconfig-agent-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/osconfig/google-osconfig-agent-((.:package-version))-g1.el8.x86_64.rpm","gs://gcp-guest-package-uploads/osconfig/google-osconfig-agent-((.:package-version))-g1.el8.aarch64.rpm"',
os_type: 'EL8_YUM',
Expand Down Expand Up @@ -840,7 +768,7 @@ local build_and_upload_guest_agent = build_guest_agent {
},
buildpackagejob {
package: 'guest-diskexpand',
builds: ['deb10', 'el7', 'el8', 'el9'],
builds: ['deb12', 'el8', 'el9'],
gcs_dir: 'gce-disk-expand',
uploads: [
uploadpackageversiontask {
Expand All @@ -852,15 +780,6 @@ local build_and_upload_guest_agent = build_guest_agent {
reponame: 'gce-disk-expand',
sbom_file: 'gs://gcp-guest-package-uploads/gce-disk-expand/gce-disk-expand-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/gce-disk-expand/gce-disk-expand-((.:package-version))-g1.el7.noarch.rpm"',
os_type: 'EL7_YUM',
pkg_inside_name: 'gce-disk-expand',
pkg_name: 'guest-diskexpand',
pkg_version: '((.:package-version))',
reponame: 'gce-disk-expand-el7',
sbom_file: 'gs://gcp-guest-package-uploads/gce-disk-expand/gce-disk-expand-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/gce-disk-expand/gce-disk-expand-((.:package-version))-g1.el8.noarch.rpm"',
os_type: 'EL8_YUM',
Expand All @@ -883,7 +802,7 @@ local build_and_upload_guest_agent = build_guest_agent {
},
buildpackagejob {
package: 'guest-configs',
builds: ['deb10', 'el7', 'el8', 'el9'],
builds: ['deb12', 'el8', 'el9'],
gcs_dir: 'google-compute-engine',
uploads: [
uploadpackageversiontask {
Expand Down Expand Up @@ -913,15 +832,6 @@ local build_and_upload_guest_agent = build_guest_agent {
reponame: 'gce-google-compute-engine-bookworm',
sbom_file: 'gs://gcp-guest-package-uploads/google-compute-engine/google-compute-engine-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/google-compute-engine/google-compute-engine-((.:package-version))-g1.el7.noarch.rpm"',
os_type: 'EL7_YUM',
pkg_inside_name: 'google-compute-engine',
pkg_name: 'guest-configs',
pkg_version: '((.:package-version))',
reponame: 'gce-google-compute-engine-el7',
sbom_file: 'gs://gcp-guest-package-uploads/google-compute-engine/google-compute-engine-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/google-compute-engine/google-compute-engine-((.:package-version))-g1.el8.noarch.rpm"',
os_type: 'EL8_YUM',
Expand All @@ -944,18 +854,9 @@ local build_and_upload_guest_agent = build_guest_agent {
},
buildpackagejob {
package: 'artifact-registry-yum-plugin',
builds: ['el7', 'el8', 'el8-arm64', 'el9', 'el9-arm64'],
builds: ['el8', 'el8-arm64', 'el9', 'el9-arm64'],
gcs_dir: 'yum-plugin-artifact-registry',
uploads: [
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/yum-plugin-artifact-registry/yum-plugin-artifact-registry-((.:package-version))-g1.el7.x86_64.rpm"',
os_type: 'EL7_YUM',
pkg_inside_name: 'yum-plugin-artifact-registry',
pkg_name: 'artifact-registry-yum-plugin',
pkg_version: '((.:package-version))',
reponame: 'yum-plugin-artifact-registry-el7',
sbom_file: 'gs://gcp-guest-package-uploads/yum-plugin-artifact-registry/dnf-plugin-artifact-registry-((.:package-version)).sbom.json',
},
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/yum-plugin-artifact-registry/dnf-plugin-artifact-registry-((.:package-version))-g1.el8.x86_64.rpm","gs://gcp-guest-package-uploads/yum-plugin-artifact-registry/dnf-plugin-artifact-registry-((.:package-version))-g1.el8.aarch64.rpm"',
os_type: 'EL8_YUM',
Expand All @@ -978,7 +879,7 @@ local build_and_upload_guest_agent = build_guest_agent {
},
buildpackagejob {
package: 'artifact-registry-apt-transport',
builds: ['deb10', 'deb11-arm64'],
builds: ['deb12', 'deb11-arm64'],
uploads: [
uploadpackageversiontask {
gcs_files: '"gs://gcp-guest-package-uploads/artifact-registry-apt-transport/apt-transport-artifact-registry_((.:package-version))-g1_amd64.deb","gs://gcp-guest-package-uploads/artifact-registry-apt-transport/apt-transport-artifact-registry_((.:package-version))-g1_arm64.deb"',
Expand Down

0 comments on commit 57af909

Please sign in to comment.