The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/204

This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.

=== Description (from pull-request) ===

From c0cec678ca28e61140ffcad8beab06de6faf322f Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Wed, 4 Nov 2020 09:21:29 +0100
Subject: [PATCH 1/2] jenkins/jobs: Remove Alpine 3.9 (EOL)

Signed-off-by: Thomas Hipp <thomas.h...@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 eecb2a5..7577918 100644
--- a/jenkins/jobs/image-alpine.yaml
+++ b/jenkins/jobs/image-alpine.yaml
@@ -21,7 +21,6 @@
         name: release
         type: user-defined
         values:
-        - "3.9"
         - "3.10"
         - "3.11"
         - "3.12"

From bb9c9fb0507716bc97926581c18415340d5f554a Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.h...@canonical.com>
Date: Wed, 4 Nov 2020 11:01:12 +0100
Subject: [PATCH 2/2] images: Fix CentOS 8-Stream

Install kernel instead of kernel-plus for CentOS 8-Stream as the latter
has become unavailable.

Signed-off-by: Thomas Hipp <thomas.h...@canonical.com>
---
 images/centos.yaml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/images/centos.yaml b/images/centos.yaml
index bab0f40..ce4bfef 100644
--- a/images/centos.yaml
+++ b/images/centos.yaml
@@ -516,7 +516,6 @@ packages:
     - cloud
 
   - packages:
-    - kernel-plus
     - shim
     action: install
     types:
@@ -526,6 +525,23 @@ packages:
     - 8
     - 8-Stream
 
+  - packages:
+    - kernel-plus
+    action: install
+    types:
+    - vm
+    releases:
+    - 7
+    - 8
+
+  - packages:
+    - kernel
+    action: install
+    types:
+    - vm
+    releases:
+    - 8-Stream
+
   - packages:
     - grub2-efi-x64
     action: install
@@ -574,7 +590,6 @@ actions:
   - vm
   releases:
   - 8
-  - 8-Stream
 
 - trigger: post-unpack
   action: |-
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to