[lxc-devel] [lxc-ci/master] Monthly image review

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 303 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200518/064a8e5b/attachment.bin>
-------------- next part --------------
From 9706e59b29d48d5d2233ebeb7b78736432903a70 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Mon, 18 May 2020 13:20:33 +0200
Subject: [PATCH 1/4] jenkins/jobs/alpine: Remove v3.8

Support for v3.8 ended on 2020-05-01.

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 jenkins/jobs/image-alpine.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jenkins/jobs/image-alpine.yaml b/jenkins/jobs/image-alpine.yaml
index d7327c5..8eaf29e 100644
--- a/jenkins/jobs/image-alpine.yaml
+++ b/jenkins/jobs/image-alpine.yaml
@@ -21,7 +21,6 @@
         name: release
         type: user-defined
         values:
-        - "3.8"
         - "3.9"
         - "3.10"
         - "3.11"

From 0d5443fee434cba6ef5da9d29dc962758cd88b9e Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Mon, 18 May 2020 13:21:14 +0200
Subject: [PATCH 2/4] jenkins/jobs/alpine: Remove filters

This removes the combination filter as the included releases are all
EOL.

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

diff --git a/jenkins/jobs/image-alpine.yaml b/jenkins/jobs/image-alpine.yaml
index 8eaf29e..ee03d9f 100644
--- a/jenkins/jobs/image-alpine.yaml
+++ b/jenkins/jobs/image-alpine.yaml
@@ -46,15 +46,6 @@
             ${LXD_ARCHITECTURE} container 600 ${WORKSPACE} \
             -o image.architecture=${ARCH} -o image.release=${release}
 
-    execution-strategy:
-      combination-filter: '
-      !(architecture=="ppc64el" && release=="3.5")
-      && !(architecture=="s390x" && release=="3.5")
-      && !(architecture=="ppc64el" && release=="3.6")
-      && !(architecture=="s390x" && release=="3.6")
-      && !(architecture=="ppc64el" && release=="3.7")
-      && !(architecture=="s390x" && release=="3.7")'
-
     properties:
     - build-discarder:
         num-to-keep: 2

From df688e9beb1b7cce43ba615ebf710be6bceb49b6 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Mon, 18 May 2020 13:26:05 +0200
Subject: [PATCH 3/4] jenkins/jobs/alt: Remove p8

Support for p8 ended on 2019-12-16.

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

diff --git a/jenkins/jobs/image-alt.yaml b/jenkins/jobs/image-alt.yaml
index 7ab11ac..0ae2449 100644
--- a/jenkins/jobs/image-alt.yaml
+++ b/jenkins/jobs/image-alt.yaml
@@ -20,7 +20,6 @@
         type: user-defined
         values:
         - Sisyphus
-        - p8
         - p9
 
     - axis:
@@ -30,9 +29,7 @@
         - default
 
     execution-strategy:
-      combination-filter: '
-      !(architecture=="arm64" && release=="p8")
-      && !(architecture=="ppc64el" && release!="Sisyphus")'
+      combination-filter: '!(architecture=="ppc64el" && release!="Sisyphus")'
 
     builders:
     - shell: |-

From a34f283372b4a2ac9cb471c72d1fda2b6d541d6f Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Mon, 18 May 2020 13:32:46 +0200
Subject: [PATCH 4/4] jenkins/jobs/apertis: Remove 18.12

Support for 18.12 has ended.

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 jenkins/jobs/image-apertis.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jenkins/jobs/image-apertis.yaml b/jenkins/jobs/image-apertis.yaml
index 96e9648..7b610a8 100644
--- a/jenkins/jobs/image-apertis.yaml
+++ b/jenkins/jobs/image-apertis.yaml
@@ -18,7 +18,6 @@
         name: release
         type: user-defined
         values:
-        - '18.12'
         - 'v2019.2'
         - 'v2020.0'