From 09dcdedf001f4e06103cfbe402d5f887b24b24cc Mon Sep 17 00:00:00 2001
From: Sagi Shnaidman <sshnaidm@redhat.com>
Date: Wed, 1 Sep 2021 00:25:11 +0300
Subject: [PATCH] Preliminary work to support CentOS 9 Stream

Changes package mappings to default to Python 3. Unfortunately, the
build does not work yet because of some issue in DIB.

Co-Authored-By: Dmitry Tantsur <dtantsur@protonmail.com>
Change-Id: I88c1ec2590d280745daa6c8b3aa9a719f5d96e72
---
 dib/extra-hardware/pkg-map                   | 15 ++++++---
 dib/ironic-python-agent-ramdisk/pkg-map      | 35 ++++++++------------
 zuul.d/ironic-python-agent-builder-jobs.yaml | 17 ++++++++++
 zuul.d/project.yaml                          |  6 ++++
 4 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/dib/extra-hardware/pkg-map b/dib/extra-hardware/pkg-map
index f2fa654..e68e52f 100644
--- a/dib/extra-hardware/pkg-map
+++ b/dib/extra-hardware/pkg-map
@@ -1,17 +1,22 @@
 {
   "release": {
     "rhel": {
-      "8": {
-        "python-hardware": "python3-hardware-detect"
+      "7": {
+        "python-hardware": "python-hardware"
       }
     },
     "centos": {
-      "8": {
-        "python-hardware": "python3-hardware-detect"
+      "7": {
+        "python-hardware": "python-hardware"
       }
     }
   },
+  "family": {
+    "redhat": {
+      "python-hardware": "python3-hardware-detect"
+    }
+  },
   "default": {
-    "python-hardware": "python-hardware"
+    "python-hardware": "python3-hardware"
   }
 }
diff --git a/dib/ironic-python-agent-ramdisk/pkg-map b/dib/ironic-python-agent-ramdisk/pkg-map
index 984ef6b..42fc7f9 100644
--- a/dib/ironic-python-agent-ramdisk/pkg-map
+++ b/dib/ironic-python-agent-ramdisk/pkg-map
@@ -1,41 +1,30 @@
 {
   "release": {
     "rhel": {
-      "8": {
-        "tgt": "target-restore",
-        "python": "python3",
-        "python-dev": "python3-devel"
+      "7": {
+        "python": "python",
+        "python-dev": "python-devel",
+        "tgt": "scsi-target-utils"
       }
     },
     "centos": {
-      "8": {
-        "tgt": "target-restore",
-        "python": "python3",
-        "python-dev": "python3-devel"
-      }
-    },
-    "ubuntu": {
-      "bionic": {
-        "python": "python3",
-        "python-dev": "python3-dev"
+      "7": {
+        "python": "python",
+        "python-dev": "python-devel",
+        "tgt": "scsi-target-utils"
       }
     }
   },
   "family": {
     "redhat": {
-      "tgt": "scsi-target-utils",
       "libffi-dev": "libffi-devel",
       "libssl-dev": "openssl-devel",
+      "python-dev": "python3-devel",
       "qemu-utils": "qemu-img",
-      "python-dev": "python-devel"
-    },
-    "debian": {
-      "python": "python3",
-      "python-dev": "python3-dev"
+      "tgt": "target-restore"
     },
     "suse": {
       "qemu-utils": "qemu",
-      "python": "python3",
       "genisoimage": "mkisofs",
       "gdisk": "gptfdisk",
       "libffi-dev": "libffi-devel",
@@ -46,6 +35,8 @@
     }
   },
   "default": {
-    "ironic-python-agent": "openstack-ironic-python-agent"
+    "ironic-python-agent": "openstack-ironic-python-agent",
+    "python": "python3",
+    "python-dev": "python3-dev"
   }
 }
diff --git a/zuul.d/ironic-python-agent-builder-jobs.yaml b/zuul.d/ironic-python-agent-builder-jobs.yaml
index c616427..36d45a2 100644
--- a/zuul.d/ironic-python-agent-builder-jobs.yaml
+++ b/zuul.d/ironic-python-agent-builder-jobs.yaml
@@ -112,6 +112,23 @@
     vars:
       extra_elements: ["extra-hardware"]
 
+- job:
+    name: ironic-python-agent-check-image-dib-centos9
+    parent: ironic-python-agent-check-image-base
+    required-projects:
+      - openstack/diskimage-builder
+    vars:
+      image_type: 'dib'
+      image_distro: 'centos'
+      image_release: '9-stream'
+      image_target_name: centos9
+
+- job:
+    name: ironic-python-agent-check-image-dib-centos9-extra
+    parent: ironic-python-agent-check-image-dib-centos9
+    vars:
+      extra_elements: ["extra-hardware"]
+
 - job:
     name: ironic-python-agent-check-image-dib-opensuse
     parent: ironic-python-agent-check-image-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 30927af..6d945ed 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -49,3 +49,9 @@
             branches: master
         - ironic-python-agent-build-image-dib-debian:
             branches: master
+    experimental:
+      jobs:
+        - ironic-python-agent-check-image-dib-centos9:
+            voting: false
+        - ironic-python-agent-check-image-dib-centos9-extra:
+            voting: false