ci: Move active Debian-10 jobs to Debian-11

Debian 10 will reach EOL in august of 2022 and thus libvirt will no
longer target it. Move CI jobs over to Debian-11.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index e3ed4a0753e4642a0abc101393d89653fe40e494..953c1b078f85884aa9cf8070f6c71e0d7b6095bf 100644 (file)
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -86,6 +86,7 @@ x86_64-debian-10:
       optional: true
   allow_failure: false
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10
 
 
@@ -96,7 +97,6 @@ x86_64-debian-11:
       optional: true
   allow_failure: false
   variables:
-    JOB_OPTIONAL: 1
     NAME: debian-11
 
 
@@ -264,6 +264,7 @@ armv7l-debian-10:
   allow_failure: false
   variables:
     CROSS: armv7l
+    JOB_OPTIONAL: 1
     NAME: debian-10
 
 
@@ -371,7 +372,6 @@ armv7l-debian-11:
   allow_failure: false
   variables:
     CROSS: armv7l
-    JOB_OPTIONAL: 1
     NAME: debian-11
 
 

diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index fe96be32f5d7ae19e22ce5c18c1d9c9a804e1ea0..b77baf509ea825f375891b61ebea9565152852b2 100644 (file)
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -46,6 +46,7 @@ x86_64-debian-10-container:
   extends: .container_job
   allow_failure: false
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10
 
 
@@ -135,6 +136,7 @@ armv7l-debian-10-container:
   extends: .container_job
   allow_failure: false
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10-cross-armv7l
 
 
@@ -206,7 +208,6 @@ armv7l-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
-    JOB_OPTIONAL: 1
     NAME: debian-11-cross-armv7l
 
 

diff --git a/ci/manifest.yml b/ci/manifest.yml
index e9ef1b47ed72a0f13d58dafb6a9417942815b44a..54d3de7a8ece15a52da307fd985d24e9f309cf9c 100644 (file)
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -45,6 +45,7 @@ targets:
   debian-10:
     jobs:
       - arch: x86_64
+        builds: false
 
       - arch: aarch64
         allow-failure: true
@@ -55,6 +56,7 @@ targets:
         builds: false
 
       - arch: armv7l
+        builds: false
 
       - arch: i686
         allow-failure: true
@@ -83,7 +85,6 @@ targets:
   debian-11:
     jobs:
       - arch: x86_64
-        builds: false
 
       - arch: x86_64
         suffix: -clang
@@ -97,8 +98,6 @@ targets:
         builds: false
 
       - arch: armv7l
-        containers: false
-        builds: false
 
       - arch: i686
         containers: false