From 41c92a1325165778b11c7265ce539fc062f23b8d Mon Sep 17 00:00:00 2001
From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 22 Jul 2022 12:24:32 +0200
Subject: [PATCH] ci: Move active Debian-10 jobs to Debian-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 ci/gitlab/builds.yml     | 4 ++--
 ci/gitlab/containers.yml | 3 ++-
 ci/manifest.yml          | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index e3ed4a0753..953c1b078f 100644
--- 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 fe96be32f5..b77baf509e 100644
--- 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 e9ef1b47ed..54d3de7a8e 100644
--- 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