The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/207
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 03fa639a708dde4ed6479ebb0c917ed65c02c2e1 Mon Sep 17 00:00:00 2001 From: Thomas Hipp <thomas.h...@canonical.com> Date: Tue, 8 Dec 2020 16:21:13 +0100 Subject: [PATCH 1/2] jenkins/jobs: Drop CentOS 6 (EOL) Signed-off-by: Thomas Hipp <thomas.h...@canonical.com> --- jenkins/jobs/image-centos.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/jenkins/jobs/image-centos.yaml b/jenkins/jobs/image-centos.yaml index 607e4d2..e711ad0 100644 --- a/jenkins/jobs/image-centos.yaml +++ b/jenkins/jobs/image-centos.yaml @@ -20,7 +20,6 @@ name: release type: user-defined values: - - 6 - 7 - 8 - 8-Stream @@ -53,7 +52,7 @@ fi TYPE="container" - if [ "${architecture}" = "amd64" ] && [ "${release}" != "6" ]; then + if [ "${architecture}" = "amd64" ]; then TYPE="container,vm" fi @@ -64,13 +63,11 @@ execution-strategy: combination-filter: ' - !(architecture=="arm64" && release == "6") - && !(architecture=="arm64" && release == "7") + !(architecture=="arm64" && release == "7") && !(architecture=="ppc64el" && release == "7") && !(architecture=="armhf" && release != "7") && !(architecture=="i386" && release == "8") - && !(architecture=="i386" && release == "8-Stream") - && !(architecture=="ppc64el" && release == "6")' + && !(architecture=="i386" && release == "8-Stream")' properties: - build-discarder: From 24b0966efec24ca3990bc4f6479ef4ace38f9bfe Mon Sep 17 00:00:00 2001 From: Thomas Hipp <thomas.h...@canonical.com> Date: Tue, 8 Dec 2020 16:22:39 +0100 Subject: [PATCH 2/2] images: Remove CentOS 6 references Signed-off-by: Thomas Hipp <thomas.h...@canonical.com> --- images/centos.yaml | 37 ------------------------------------- 1 file changed, 37 deletions(-) diff --git a/images/centos.yaml b/images/centos.yaml index ce4bfef..8d4bc61 100644 --- a/images/centos.yaml +++ b/images/centos.yaml @@ -259,7 +259,6 @@ files: MTU= DHCP_HOSTNAME=LXC_NAME releases: - - 6 - 7 types: - container @@ -295,7 +294,6 @@ files: MTU= DHCP_HOSTNAME={{ container.name }} releases: - - 6 - 7 - name: ifcfg-eth0.lxd @@ -416,41 +414,6 @@ files: NETWORKING=yes HOSTNAME={{ container.name }} -- name: lxc-sysinit - path: /etc/init/lxc-sysinit.conf - generator: dump - content: |- - start on startup - env container - - pre-start script - if [ "x$container" != "xlxc" -a "x$container" != "xlibvirt" ]; then - stop; - fi - - rm -f /var/lock/subsys/* - rm -f /var/run/*.pid - [ -e /etc/mtab ] || ln -s /proc/mounts /etc/mtab - mkdir -p /dev/shm - mount -t tmpfs -o nosuid,nodev tmpfs /dev/shm - - initctl start tty TTY=console - telinit 3 - exit 0 - end script - releases: - - 6 - -- name: sigpwr.conf - path: /etc/init/power-status-changed.conf - generator: dump - content: |- - start on power-status-changed - - exec /sbin/shutdown -h now "SIGPWR received" - releases: - - 6 - - name: meta-data generator: cloud-init variants:
_______________________________________________ lxc-devel mailing list lxc-devel@lists.linuxcontainers.org http://lists.linuxcontainers.org/listinfo/lxc-devel