From 4342c31ae20306be556054a596ee9654bb4e76af Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 13 Mar 2024 12:08:51 +0900
Subject: [PATCH] dib: Remove Ubuntu Forcal support

Ubuntu Focal is no longer part of the tested environments, because of
newer LTS available now (Jammy).

Change-Id: I7a6df974762abdd94784416609304618ce702b6e
---
 elements/amphora-agent/package-installs.yaml  |  7 ------
 .../post-install.d/10-enable-network-scripts  | 12 ----------
 ...emove-forcal-support-2f7991f2d435876f.yaml |  5 +++++
 zuul.d/jobs.yaml                              | 22 -------------------
 zuul.d/projects.yaml                          |  4 ----
 5 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100755 elements/amphora-agent/post-install.d/10-enable-network-scripts
 create mode 100644 releasenotes/notes/remove-forcal-support-2f7991f2d435876f.yaml

diff --git a/elements/amphora-agent/package-installs.yaml b/elements/amphora-agent/package-installs.yaml
index 6bcc2eeeda..3ad31f3627 100644
--- a/elements/amphora-agent/package-installs.yaml
+++ b/elements/amphora-agent/package-installs.yaml
@@ -7,21 +7,14 @@ 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/elements/amphora-agent/post-install.d/10-enable-network-scripts b/elements/amphora-agent/post-install.d/10-enable-network-scripts
deleted file mode 100755
index 4946bd2ca2..0000000000
--- a/elements/amphora-agent/post-install.d/10-enable-network-scripts
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
-    set -x
-fi
-
-set -eu
-set -o pipefail
-
-if [[ "$DISTRO_NAME" =~ (ubuntu) ]] && [ "$DIB_RELEASE" == "focal" ]; then
-    systemctl enable systemd-networkd
-fi
diff --git a/releasenotes/notes/remove-forcal-support-2f7991f2d435876f.yaml b/releasenotes/notes/remove-forcal-support-2f7991f2d435876f.yaml
new file mode 100644
index 0000000000..eb35e9271e
--- /dev/null
+++ b/releasenotes/notes/remove-forcal-support-2f7991f2d435876f.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The diskimage-builder elements for amphora image no longer supports Ubuntu
+    Focal.
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index e954d78d8e..07ed2a04e3 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -8,16 +8,6 @@
         - openstack/octavia
         - openstack/octavia-lib
 
-- job:
-    name: publish-openstack-octavia-amphora-image-focal
-    parent: publish-openstack-octavia-amphora-image
-    nodeset: ubuntu-focal
-    description: |
-      Publish Ubuntu Focal (20.04) based amphora image to tarballs.o.o.
-    vars:
-        amphora_os: ubuntu
-        amphora_os_release: focal
-
 - job:
     name: publish-openstack-octavia-amphora-image-jammy
     parent: publish-openstack-octavia-amphora-image
@@ -188,18 +178,6 @@
         amphora_os: ubuntu
         amphora_os_release: jammy
 
-- job:
-    name: octavia-amphora-image-build-live-focal
-    parent: octavia-amphora-image-build
-    description: |
-      Builds an Ubuntu Focal 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: focal
-
 - job:
     name: octavia-amphora-image-build-live-jammy
     parent: octavia-amphora-image-build
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index a6d1f8b597..4541aad682 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -122,10 +122,6 @@
         #- octavia-grenade-skip-level
     periodic:
       jobs:
-        - publish-openstack-octavia-amphora-image-focal:
-            branches:
-              regex: ^stable/.*$
-              negate: true
         - publish-openstack-octavia-amphora-image-jammy:
             branches:
               regex: ^stable/.*$