From de72b36dddfc703d76d79479dde7b92f0a78e924 Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Wed, 13 Jul 2022 16:00:33 +0200
Subject: [PATCH] ci: test container embedding on CentOS stream 8

Now that we have enabled container embedding on RHEL 8, let's
also test it there.
We also pin it for Fedora and RHEL/CS 9 to be able to use the
new `org.osbuild.containers.storage.conf` stage.
---
 .gitlab-ci.yml |  9 ++++++---
 Schutzfile     | 26 ++++++++++++++++++--------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ed52b99ab..0ca377030 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -680,9 +680,12 @@ ContainerEmbedding:
   script:
     - schutzbot/deploy.sh
     - /usr/libexec/tests/osbuild-composer/container-embedding.sh
-  variables:
-    RUNNER: aws/centos-stream-9-x86_64
-    INTERNAL_NETWORK: "true"
+  parallel:
+    matrix:
+      - INTERNAL_NETWORK: "true"
+        RUNNER:
+        - aws/centos-stream-8-x86_64
+        - aws/centos-stream-9-x86_64
 
 finish:
   stage: finish
diff --git a/Schutzfile b/Schutzfile
index 20d75b915..b4a444f03 100644
--- a/Schutzfile
+++ b/Schutzfile
@@ -2,7 +2,7 @@
   "fedora-35": {
     "dependencies": {
       "osbuild": {
-        "commit": "d602b5ff7f40dd3abb956d29aa0c7573e6e0ed29"
+        "commit": "51315a985aa3c26179acead9459db9c249a8b4f6"
       }
     },
     "repos": [
@@ -156,21 +156,21 @@
   "rhel-8.4": {
     "dependencies": {
       "osbuild": {
-        "commit": "d602b5ff7f40dd3abb956d29aa0c7573e6e0ed29"
+        "commit": "51315a985aa3c26179acead9459db9c249a8b4f6"
       }
     }
   },
   "rhel-8.6": {
     "dependencies": {
       "osbuild": {
-        "commit": "d602b5ff7f40dd3abb956d29aa0c7573e6e0ed29"
+        "commit": "51315a985aa3c26179acead9459db9c249a8b4f6"
       }
     }
   },
   "rhel-8.7": {
     "dependencies": {
       "osbuild": {
-        "commit": "d602b5ff7f40dd3abb956d29aa0c7573e6e0ed29"
+        "commit": "51315a985aa3c26179acead9459db9c249a8b4f6"
       }
     },
     "repos": [
@@ -216,14 +216,14 @@
   "rhel-9.0": {
     "dependencies": {
       "osbuild": {
-        "commit": "d602b5ff7f40dd3abb956d29aa0c7573e6e0ed29"
+        "commit": "51315a985aa3c26179acead9459db9c249a8b4f6"
       }
     }
   },
   "rhel-9.1": {
     "dependencies": {
       "osbuild": {
-        "commit": "d602b5ff7f40dd3abb956d29aa0c7573e6e0ed29"
+        "commit": "51315a985aa3c26179acead9459db9c249a8b4f6"
       }
     },
     "repos": [
@@ -269,18 +269,23 @@
   "centos-8": {
     "dependencies": {
       "osbuild": {
-        "commit": "d602b5ff7f40dd3abb956d29aa0c7573e6e0ed29"
+        "commit": "51315a985aa3c26179acead9459db9c249a8b4f6"
       }
     }
   },
   "centos-9": {
     "dependencies": {
       "osbuild": {
-        "commit": "d602b5ff7f40dd3abb956d29aa0c7573e6e0ed29"
+        "commit": "51315a985aa3c26179acead9459db9c249a8b4f6"
       }
     }
   },
   "centos-stream-9": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "51315a985aa3c26179acead9459db9c249a8b4f6"
+      }
+    },
     "repos": [
       {
         "file": "/etc/yum.repos.d/centos.repo",
@@ -322,6 +327,11 @@
     ]
   },
   "centos-stream-8": {
+    "dependencies": {
+      "osbuild": {
+        "commit": "51315a985aa3c26179acead9459db9c249a8b4f6"
+      }
+    },
     "repos": [
       {
         "file": "/etc/yum.repos.d/CentOS-Stream-BaseOS.repo",