[lxc-devel] [lxc-ci/master] jenkins/jobs: Add CentOS 8

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 356 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20191009/430ff20e/attachment.bin>
-------------- next part --------------
From d1de7e12dbc2f79f8429b85edbd1ce8fd1fd12fc Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Thu, 10 Oct 2019 07:36:16 +0200
Subject: [PATCH] jenkins/jobs: Add CentOS 8

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

diff --git a/jenkins/jobs/image-centos.yaml b/jenkins/jobs/image-centos.yaml
index 799f843..a9c7605 100644
--- a/jenkins/jobs/image-centos.yaml
+++ b/jenkins/jobs/image-centos.yaml
@@ -22,6 +22,7 @@
         values:
         - 6
         - 7
+        - 8
 
     - axis:
         name: variant
@@ -48,10 +49,14 @@
         [ "${ARCH}" = "ppc64el" ] && ARCH="ppc64le"
 
         EXTRA_ARGS=""
-        if [ "${architecture}" != "amd64" ] && ([ "${architecture}" != "i386" ] || [ "${release}" != "6" ]); then
+        if [ "${architecture}" != "amd64" ] && [ "${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
+            EXTRA_ARGS="${EXTRA_ARGS} -o source.variant=dvd1"
+        fi
+
         exec sudo /lxc-ci/bin/build-distro /lxc-ci/images/centos.yaml \
             ${LXD_ARCHITECTURE} 7200 ${WORKSPACE} \
             -o image.architecture=${ARCH} \
@@ -61,7 +66,7 @@
     execution-strategy:
       combination-filter: '
       !(architecture=="arm64" && release == "6")
-      && !(architecture=="armhf" && release == "6")
+      && !(architecture=="armhf" && release != "7")
       && !(architecture=="ppc64el" && release == "6")'
 
     properties: