From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 6 Feb 2023 14:38:46 +0000 (+0100)
Subject: ci: leap < 15.4 are dead
X-Git-Tag: v5.7.0~17^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0c6c910e81fb508056228e67a2b045089610f78;p=thirdparty%2Fknot-resolver.git

ci: leap < 15.4 are dead

These packaging tests are dying anyway;
the manager branch reworked them.
So at least the breakages won't be shown in red until then.

https://gitlab.nic.cz/knot/knot-resolver/-/jobs/852665
https://build.opensuse.org/request/show/1050454

obs:leap15 after updating fails later in the vagrant step though:
https://gitlab.nic.cz/knot/knot-resolver/-/jobs/852799
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e707161ad..f35d4114c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -700,10 +700,11 @@ obs:fedora36:x86_64:
 
 obs:leap15:x86_64:
   <<: *distrotest
+  allow_failure: true
   variables:
     OBS_REPO: knot-resolver-latest
     DISTROTEST_NAME: leap15
-    DISTROTEST_REPO: openSUSE_Leap_15.3
+    DISTROTEST_REPO: openSUSE_Leap_15.4
 
 obs:ubuntu1804:x86_64:
   <<: *distrotest
@@ -765,9 +766,4 @@ packaging:fedora_32:
   variables:
     DISTRO: fedora_32
 
-packaging:leap_15.2:
-  <<: *packagingtest
-  variables:
-    DISTRO: leap_15.2
-
 # }}}
diff --git a/ci/pkgtest.yaml b/ci/pkgtest.yaml
index 74f6ec8d2..e841a972b 100644
--- a/ci/pkgtest.yaml
+++ b/ci/pkgtest.yaml
@@ -92,22 +92,6 @@ fedora-35:pkgbuild:
     - dnf install -y rpm-build python3-pip
     - *apkgbuild
 
-opensuse-15.2:pkgbuild:
-  <<: *pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/opensuse-15.2
-  script:
-    - zypper addrepo -G -f https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/openSUSE_Leap_15.2/home:CZ-NIC:knot-resolver-build.repo
-    - zypper install -y rpm-build python3-pip
-    - *apkgbuild
-
-opensuse-15.3:pkgbuild:
-  <<: *pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/opensuse-15.3
-  script:
-    - zypper addrepo -G -f https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/openSUSE_Leap_15.3/home:CZ-NIC:knot-resolver-build.repo
-    - zypper install -y rpm-build python3-pip
-    - *apkgbuild
-
 rocky-8:pkgbuild:
   <<: *pkgbuild
   image: $CI_REGISTRY/labs/lxc-gitlab-runner/rocky-8
@@ -240,30 +224,6 @@ fedora-35:pkgtest:
     - systemctl start kresd@1
     - kdig @127.0.0.1 nic.cz | grep -qi NOERROR
 
-opensuse-15.2:pkgtest:
-  <<: *pkgtest
-  needs:
-    - opensuse-15.2:pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/opensuse-15.2
-  script:
-    - zypper addrepo -G -f https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/openSUSE_Leap_15.2/home:CZ-NIC:knot-resolver-build.repo
-    - zypper install -y knot-utils
-    - zypper install --allow-unsigned-rpm -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module | grep -v debug | grep -v devel)
-    - systemctl start kresd@1
-    - kdig @127.0.0.1 nic.cz | grep -qi NOERROR
-
-opensuse-15.3:pkgtest:
-  <<: *pkgtest
-  needs:
-    - opensuse-15.3:pkgbuild
-  image: $CI_REGISTRY/labs/lxc-gitlab-runner/opensuse-15.3
-  script:
-    - zypper addrepo -G -f https://download.opensuse.org/repositories/home:CZ-NIC:knot-resolver-build/openSUSE_Leap_15.3/home:CZ-NIC:knot-resolver-build.repo
-    - zypper install -y knot-utils
-    - zypper install --allow-unsigned-rpm -y $(find ./pkg/pkgs -name '*.rpm' | grep -v module | grep -v debug | grep -v devel)
-    - systemctl start kresd@1
-    - kdig @127.0.0.1 nic.cz | grep -qi NOERROR
-
 rocky-8:pkgtest:
   <<: *pkgtest
   needs: