Generate manifests on c10s and RHEL-10.0-nightly (COMPOSER-2161)

.gitlab-ci.yml

@@ -62,6 +62,8 @@ Regression:
           - aws/fedora-39-aarch64
           - aws/centos-stream-9-x86_64
           - aws/centos-stream-9-aarch64
+          - aws/centos-stream-10-x86_64
+          - aws/centos-stream-10-aarch64
       - PARALLEL_EXEC: ["1/4", "2/4", "3/4", "4/4"]
         RUNNER:
           - aws/rhel-8.10-ga-x86_64
@@ -70,6 +72,8 @@ Regression:
           - aws/rhel-9.4-ga-aarch64
           - aws/rhel-9.5-nightly-x86_64
           - aws/rhel-9.5-nightly-aarch64
+          - aws/rhel-10.0-nightly-x86_64
+          - aws/rhel-10.0-nightly-aarch64
         INTERNAL_NETWORK: "true"
 
 Manifest-gen:
@@ -112,6 +116,8 @@ Image-info-build:
           - aws/fedora-39-aarch64
           - aws/centos-stream-9-x86_64
           - aws/centos-stream-9-aarch64
+          - aws/centos-stream-10-x86_64
+          - aws/centos-stream-10-aarch64
       - PARALLEL_EXEC: ["1/4", "2/4", "3/4", "4/4"]
         RUNNER:
           - aws/rhel-8.10-ga-x86_64
@@ -120,6 +126,8 @@ Image-info-build:
           - aws/rhel-9.4-ga-aarch64
           - aws/rhel-9.5-nightly-x86_64
           - aws/rhel-9.5-nightly-aarch64
+          - aws/rhel-10.0-nightly-x86_64
+          - aws/rhel-10.0-nightly-aarch64
         INTERNAL_NETWORK: "true"
 
 push-image-info:

README.md

@@ -44,7 +44,7 @@ different workflow than the one used to run the regression testing.
 
 #### 2/ on CI: Manifest generation
 
-The first job downloads the latest osbuild-composer sources from upstream,
+The first job downloads the latest `osbuild/images` sources from upstream,
 [generates all the test
 manifests](https://github.com/osbuild/manifest-db/blob/main/.gitlab-ci.yml#L68)
 using the gen-manifest tool and stores them as an
@@ -157,7 +157,7 @@ they should not belong in Composer
 
 Image definitions are the way we describe an image and there is one for every image
 we support. Definitions can be found in
-[osbuild-composer/internal/distros](https://github.com/osbuild/osbuild-composer/tree/main/internal/distro)
+[images](https://github.com/osbuild/images) repository.
 
 ### Image definitions must be tested
 

Schutzfile

@@ -2,10 +2,7 @@
   "global": {
     "dependencies": {
       "osbuild": {
-        "commit": "41f528eeb23ab1719aa16c94f8c7313e7765276d"
-      },
-      "osbuild-composer": {
-        "commit": "ae4467ab0d551ba2a972a6ce55b601cbc35f36b5"
+        "commit": "df83c629201f3955dfb07016c31409d85f376a29"
       }
     }
   },
@@ -88,6 +85,47 @@
       }
     ]
   },
+  "centos-stream-10": {
+    "repos": [
+      {
+        "file": "/etc/yum.repos.d/centos.repo",
+        "x86_64": [
+          {
+            "title": "baseos",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-baseos-20240715"
+          },
+          {
+            "title": "appstream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-appstream-20240715"
+          },
+          {
+            "title": "crb",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-x86_64-crb-20240715"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "baseos",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-baseos-20240715"
+          },
+          {
+            "title": "appstream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-appstream-20240715"
+          },
+          {
+            "title": "crb",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/public/el10/cs10-aarch64-crb-20240715"
+          }
+        ]
+      }
+    ]
+  },
   "rhel-8.10": {
     "repos": [
       {
@@ -210,5 +248,46 @@
         ]
       }
     ]
+  },
+  "rhel-10.0": {
+    "repos": [
+      {
+        "file": "/etc/yum.repos.d/rhel10internal.repo",
+        "x86_64": [
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-baseos-n10.0-20240715"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-appstream-n10.0-20240715"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-x86_64-crb-n10.0-20240715"
+          }
+        ],
+        "aarch64": [
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-BaseOS",
+            "name": "baseos",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-baseos-n10.0-20240715"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-AppStream",
+            "name": "appstream",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-appstream-n10.0-20240715"
+          },
+          {
+            "title": "RHEL-10-RPMREPO-NIGHTLY-CRB",
+            "name": "crb",
+            "baseurl": "https://rpmrepo.osbuild.org/v2/mirror/rhvpn/el10/el10-aarch64-crb-n10.0-20240715"
+          }
+        ]
+      }
+    ]
   }
 }

schutzbot/deploy.sh

@@ -6,9 +6,6 @@ sudo dnf install -y jq
 
 DNF_REPO_BASEURL=http://osbuild-composer-repos.s3.amazonaws.com
 
-# The osbuild-composer commit to run reverse-dependency test against.
-# Currently: rpmbuild: build rpms on RHEL 8.8 and 9.2
-OSBUILD_COMPOSER_COMMIT=$(jq -r '.global.dependencies."osbuild-composer".commit' Schutzfile)
 OSBUILD_COMMIT=$(jq -r '.global.dependencies.osbuild.commit' Schutzfile)
 
 # Get OS details.
@@ -36,21 +33,8 @@ enabled=1
 gpgcheck=0
 # Default dnf repo priority is 99. Lower number means higher priority.
 priority=5
-
-[osbuild-composer]
-name=osbuild-composer ${OSBUILD_COMPOSER_COMMIT}
-baseurl=${DNF_REPO_BASEURL}/osbuild-composer/${DISTRO_VERSION}/${ARCH}/${OSBUILD_COMPOSER_COMMIT}
-enabled=1
-gpgcheck=0
-# Give this a slightly lower priority, because we used to have osbuild in this repo as well.
-priority=10
 EOF
 
-if [[ $ID == rhel || $ID == centos ]] && ! rpm -q epel-release; then
-    # Set up EPEL repository (for ansible and koji)
-    sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION_ID%.*}.noarch.rpm
-fi
-
 # Install packages needed to generate the test manifests
 sudo dnf -y install \
   osbuild \

schutzbot/gen_manifests.sh

@@ -4,7 +4,6 @@ set -euxo pipefail
 git clone https://github.com/osbuild/images.git
 cd images
 echo "Installing build dependencies"
-sudo dnf install -y redhat-rpm-config btrfs-progs-devel device-mapper-devel
-sudo dnf build-dep -y osbuild-composer
+sudo ./test/scripts/install-dependencies
 echo "Generating manifests"
 go run ./cmd/gen-manifests -workers 50 -output ../manifests --cache /var/tmp/rpmmd

schutzbot/terraform

@@ -1 +1 @@
-920a283745dc41ff5dc7070c94b2de597ccab647
+b39783c2e634fa0aa0c77d31f9374bc71554db4e

tools/osbuild-image-test

@@ -401,8 +401,8 @@ def run_tests_cases(args):
 
     success = True
     if not tests:
-        print(f"{RED}FAIL{RESET}: no tests to run")
-        return 1
+        print(f"{YELLOW}WARN{RESET}: no tests to run")
+        return 0
 
     # compute the bucket of tests this instance is gonna run.
     # by default, the bucket size is the entire test set and the bucket number