From 8c6f1a0ae5edd033734f0a784cff26de01270053 Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Mon, 20 Mar 2023 07:57:57 +0100 Subject: [PATCH] Fix focal amphora image build Purge packages based on the ditro name and release Add a testing job for building a jammy amphora image Change-Id: Ic1ec002062f91b7d3a43669e86380a2ffbdd7b18 --- elements/amphora-agent/package-installs.yaml | 11 +++++++++++ zuul.d/jobs.yaml | 18 +++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/elements/amphora-agent/package-installs.yaml b/elements/amphora-agent/package-installs.yaml index a6b6e261e6..6bcc2eeeda 100644 --- a/elements/amphora-agent/package-installs.yaml +++ b/elements/amphora-agent/package-installs.yaml @@ -7,10 +7,21 @@ build-essential: build-only: True gcc: uninstall: True +gcc-10: + uninstall: True + when: + - DISTRO_NAME = ubuntu + - DIB_RELEASE = focal gcc-11: uninstall: True + when: + - DISTRO_NAME = ubuntu + - DIB_RELEASE != focal gcc-12: uninstall: True + when: + - DISTRO_NAME = ubuntu + - DIB_RELEASE != focal git-man: uninstall: True perl: diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 284560c694..b2957137b5 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -161,9 +161,6 @@ required-projects: - openstack/octavia - openstack/octavia-lib - vars: - amphora_os: ubuntu - amphora_os_release: focal - job: name: octavia-amphora-image-build-live-focal @@ -173,6 +170,21 @@ master. This job does not publish the image. required-projects: - openstack/diskimage-builder + vars: + amphora_os: ubuntu + amphora_os_release: focal + +- job: + name: octavia-amphora-image-build-live-jammy + parent: octavia-amphora-image-build + description: | + Builds an Ubuntu Jammy amphora image using diskimage-builder from Git + master. This job does not publish the image. + required-projects: + - openstack/diskimage-builder + vars: + amphora_os: ubuntu + amphora_os_release: jammy - job: name: octavia-amphora-image-build-live-centos-9-stream