[lxc-devel] [lxc-ci/master] Clean up openSUSE 42.3 leftovers

[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/20190711/4003a482/attachment.bin>
-------------- next part --------------
From e8c65a8f91c49c2b55a90c32245a4b9022716c99 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Thu, 11 Jul 2019 09:59:17 +0200
Subject: [PATCH] Clean up openSUSE 42.3 leftovers

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 images/opensuse.yaml                   | 12 ------------
 jenkins/includes/snap-distros.yaml.inc |  2 +-
 jenkins/jobs/image-opensuse.yaml       |  3 +--
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/images/opensuse.yaml b/images/opensuse.yaml
index 74dcd9a..f2f6f6d 100644
--- a/images/opensuse.yaml
+++ b/images/opensuse.yaml
@@ -84,15 +84,3 @@ packages:
        - "15.0"
        - "tumbleweed"
       action: install
-
-actions:
-  - trigger: post-packages
-    releases:
-     - "42.3"
-    action: |-
-      #!/bin/sh
-      set -eux
-
-      # Fix boot
-      systemctl disable systemd-hwdb-update.service
-      systemd-machine-id-setup
diff --git a/jenkins/includes/snap-distros.yaml.inc b/jenkins/includes/snap-distros.yaml.inc
index 82cfcfb..779897c 100644
--- a/jenkins/includes/snap-distros.yaml.inc
+++ b/jenkins/includes/snap-distros.yaml.inc
@@ -5,7 +5,7 @@
 - fedora-28
 - manjaro
 - opensuse-15.0
-- opensuse-42.3
+- opensuse-15.1
 - opensuse-tumbleweed
 - ubuntu-14.04
 - ubuntu-16.04
diff --git a/jenkins/jobs/image-opensuse.yaml b/jenkins/jobs/image-opensuse.yaml
index 4b77c2c..19e6de1 100644
--- a/jenkins/jobs/image-opensuse.yaml
+++ b/jenkins/jobs/image-opensuse.yaml
@@ -56,8 +56,7 @@
       combination-filter: '
       !(architecture=="s390x")
       && !(architecture=="i386" && release!="tumbleweed")
-      && !(architecture=="ppc64el" && release=="15.0")
-      && !(architecture!="amd64" && release=="42.3")'
+      && !(architecture=="ppc64el" && release=="15.0")'
 
     properties:
     - build-discarder: