[lxc-devel] [lxc-ci/master] Add CentOS Stream 8

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 366 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200114/5db5af66/attachment.bin>
-------------- next part --------------
From 989a6f4ba4f5ad9d96c6f4c2a63708297d97c683 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Tue, 14 Jan 2020 22:02:24 +0100
Subject: [PATCH 1/3] images/centos: Switch to HTTPS mirror

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 images/centos.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/images/centos.yaml b/images/centos.yaml
index ca96d1b..4a6d6c3 100644
--- a/images/centos.yaml
+++ b/images/centos.yaml
@@ -3,7 +3,7 @@ image:
 
 source:
   downloader: centos-http
-  url: http://centos.mirror.iweb.ca
+  url: https://mirror.dst.ca/centos
   keys:
     # 0X99DB70FAE1D7CE227FB6488205B555B38483C65D
     - |-

From 82556fa7e564f9020147cb7add7000741f6b483b Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Tue, 14 Jan 2020 22:02:54 +0100
Subject: [PATCH 2/3] images/centos: Add CentOS Stream 8

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 images/centos.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/images/centos.yaml b/images/centos.yaml
index 4a6d6c3..e90bdda 100644
--- a/images/centos.yaml
+++ b/images/centos.yaml
@@ -374,6 +374,7 @@ files:
      DHCP_HOSTNAME=`cat /proc/sys/kernel/hostname`
    releases:
     - 8
+    - 8-Stream
 
  - name: ifcfg-eth0.lxd
    path: /etc/sysconfig/network-scripts/ifcfg-eth0
@@ -388,6 +389,7 @@ files:
      DHCP_HOSTNAME=`cat /proc/sys/kernel/hostname`
    releases:
     - 8
+    - 8-Stream
 
  - name: override.conf
    path: /etc/systemd/system/NetworkManager.service.d/override.conf
@@ -491,6 +493,7 @@ packages:
        action: install
        releases:
         - 8
+        - 8-Stream
 
      - packages:
         - cloud-init

From ae7b3c1d533472cf87cad985c2cb640ed8395843 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Tue, 14 Jan 2020 22:04:00 +0100
Subject: [PATCH 3/3] jenkins/jobs: Add CentOS Stream 8

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 jenkins/jobs/image-centos.yaml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jenkins/jobs/image-centos.yaml b/jenkins/jobs/image-centos.yaml
index 3b11106..fb58520 100644
--- a/jenkins/jobs/image-centos.yaml
+++ b/jenkins/jobs/image-centos.yaml
@@ -23,6 +23,7 @@
         - 6
         - 7
         - 8
+        - 8-Stream
 
     - axis:
         name: variant
@@ -49,11 +50,11 @@
         [ "${ARCH}" = "ppc64el" ] && ARCH="ppc64le"
 
         EXTRA_ARGS=""
-        if [ "${release}" != "8" ] && ([ "${architecture}" != "amd64" ] && [ "${architecture}" != "i386" ]) || ([ "${architecture}" = "i386" ] && [ "${release}" = "7" ]); then
+        if [ "${release}" != "8" ] && [ "${release}" != "8-Stream" ] && ([ "${architecture}" != "amd64" ] && [ "${architecture}" != "i386" ]) || ([ "${architecture}" = "i386" ] && [ "${release}" = "7" ]); then
             EXTRA_ARGS="-o source.url=http://mirror.math.princeton.edu/pub/centos-altarch/ -o source.skip_verification=true"
         fi
 
-        if [ "${release}" = "8" ]; then
+        if [ "${release}" = "8" ] || [ "${release}" = "8-Stream" ]; then
             EXTRA_ARGS="${EXTRA_ARGS} -o source.variant=boot"
         fi
 
@@ -68,6 +69,7 @@
       !(architecture=="arm64" && release == "6")
       && !(architecture=="armhf" && release != "7")
       && !(architecture=="i386" && release == "8")
+      && !(architecture=="i386" && release == "8-Stream")
       && !(architecture=="ppc64el" && release == "6")'
 
     properties: