Merge pull request #1561 from jlebon/pr/c9s-extensions-container

NO-JIRA: Various fixes for c9s variant

extensions/Dockerfile

@@ -9,6 +9,8 @@ ADD . .
 ARG COSA
 ARG VARIANT
 RUN if [[ -z "$COSA" ]] ; then ci/get-ocp-repo.sh ; fi
+# on SCOS, we need to add the GPG keys of the various SIGs we need
+RUN if rpm -q centos-stream-release; then dnf install -y centos-release-{cloud,nfv,virt}-common; fi
 RUN mkdir -p /usr/share/distribution-gpg-keys/centos
 RUN ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial /usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 RUN ln -s {/etc/pki/rpm-gpg,/usr/share/distribution-gpg-keys/centos}/RPM-GPG-KEY-CentOS-SIG-Cloud

tests/kola/rpm-ostree/replace-rt-kernel/data/c9s.repo

@@ -1,3 +1,7 @@
+# This repo is based on the c9s.repo file at the top-level, but *always* refers
+# to the mirrors and never to the latest compose output. For more information, see:
+# https://github.com/openshift/os/commit/15c7bf96b70b014f6dd55f25195cf1a341b6c6e0
+
 [baseos]
 name=CentOS Stream 9 - BaseOS
 baseurl=http://mirror.stream.centos.org/9-stream/BaseOS/$basearch/os

tests/kola/rpm-ostree/replace-rt-kernel/test.sh

@@ -37,6 +37,10 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
     runv rm -rf /etc/yum.repos.d/*
     runv cp "$KOLA_EXT_DATA/$repo_name" /etc/yum.repos.d/cs.repo
     runv curl -sSLf https://centos.org/keys/RPM-GPG-KEY-CentOS-Official -o /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-Official
+    # Disable all repos except baseos and appstream as not all of them have support for all RHCOS/SCOS supported architectures
+    runv sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/cs.repo
+    runv sed -i '/\[baseos\]/,/^ *\[/ s/enabled=0/enabled=1/' /etc/yum.repos.d/cs.repo
+    runv sed -i '/\[appstream\]/,/^ *\[/ s/enabled=0/enabled=1/' /etc/yum.repos.d/cs.repo
 
     evr=
     if rpm -q centos-stream-release; then
@@ -46,10 +50,6 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
     fi
 
     echo "Testing overriding with CentOS Stream kernel"
-    # Disable all repos except baseos and appstream as not all of them have support for all RHCOS supported architectures
-    runv sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/cs.repo
-    runv sed -i '/\[baseos\]/,/^ *\[/ s/enabled=0/enabled=1/' /etc/yum.repos.d/cs.repo
-    runv sed -i '/\[appstream\]/,/^ *\[/ s/enabled=0/enabled=1/' /etc/yum.repos.d/cs.repo
     runv rpm-ostree override replace --experimental --from repo=baseos kernel{,-core,-modules,-modules-extra,-modules-core}"${evr}"
     runv /tmp/autopkgtest-reboot 1
     ;;