test: update bootc install script to support Fedora CI gating test

Signed-off-by: Xiaofeng Wang <[email protected]>

Author: henrywang

hack/provision-derived.sh

@@ -10,26 +10,11 @@ mkdir -p ~/.config/nushell
 echo '$env.config = { show_banner: false, }' > ~/.config/nushell/config.nu
 touch ~/.config/nushell/env.nu
 
-. /usr/lib/os-release
-case "${ID}-${VERSION_ID}" in
-    "centos-9")
-        dnf config-manager --set-enabled crb
-        dnf -y install epel-release epel-next-release
-        dnf -y install nu
-        dnf clean all
-        ;;
-    "centos-10")
-        # nu is not available in CS10
-        curl -kL "https://github.com/nushell/nushell/releases/download/0.103.0/nu-0.103.0-$(uname -m)-unknown-linux-gnu.tar.gz" --output nu.tar.gz
-        mkdir -p nu && tar zvxf nu.tar.gz --strip-components=1 -C nu
-        mv nu/nu /usr/bin/nu
-        rm -rf nu nu.tar.gz
-        ;;
-    "fedora-"*)
-        dnf -y install nu
-        dnf clean all
-        ;;
-esac
+# Simplify the nu installation to work with RHEL, CS and Fedora
+curl -kL "https://github.com/nushell/nushell/releases/download/0.103.0/nu-0.103.0-$(uname -m)-unknown-linux-gnu.tar.gz" --output nu.tar.gz
+mkdir -p nu && tar zvxf nu.tar.gz --strip-components=1 -C nu
+mv nu/nu /usr/bin/nu
+rm -rf nu nu.tar.gz
 
 # Stock extra cleaning of logs and caches in general (mostly dnf)
 rm /var/log/* /var/cache /var/lib/{dnf,rpm-state,rhsm} -rf

tmt/tests/test-00-bootc-install.sh

@@ -19,7 +19,27 @@ case "$ID" in
 esac
 
 if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
+    # Fedora CI: https://github.com/fedora-ci/dist-git-pipeline/blob/master/Jenkinsfile#L145
+    # OSCI: https://gitlab.cee.redhat.com/osci-pipelines/dist-git-pipeline/-/blob/master/Jenkinsfile?ref_type=heads#L93
+    if [[ -v KOJI_TASK_ID ]] || [[ -v CI_KOJI_TASK_ID ]]; then
+        echo "$TMT_SOURCE_DIR"
+        ls -al "$TMT_SOURCE_DIR"
+        ls -al "$TMT_SOURCE_DIR/SRPMS"
+        ls -al /etc/yum.repos.d
+        cat /etc/yum.repos.d/test-artifacts.repo
+        ls -al /var/share/test-artifacts
+        # get bootc and system-reinstall-bootc rpm package name
+        BOOTC_RPM_FULL_PATH=$(find /var/share/test-artifacts/ -type f | grep -E '/bootc-[0-9]{1,2}.[0-9]{1,2}.[0-9]{1,2}-[0-9]{1,2}.(fc|el)[0-9]{1,2}.(x86_64|aarch64).rpm$')
+        BOOTC_RPM_FILE_NAME=$(basename "$BOOTC_RPM_FULL_PATH")
+        SYSTEM_REINSTALL_BOOTC_RPM_FULL_PATH=$(find /var/share/test-artifacts/ -type f | grep -E '/system-reinstall-bootc-[0-9]{1,2}.[0-9]{1,2}.[0-9]{1,2}-[0-9]{1,2}.(fc|el)[0-9]{1,2}.(x86_64|aarch64).rpm$')
+        SYSTEM_REINSTALL_BOOTC_RPM_FILE_NAME=$(basename "$SYSTEM_REINSTALL_BOOTC_RPM_FULL_PATH")
+        # Copy bootc rpm package to image build root folder
+        cp "$BOOTC_RPM_FULL_PATH" "$SYSTEM_REINSTALL_BOOTC_RPM_FULL_PATH" "$BOOTC_TEMPDIR"
+    fi
+
     # Copy bootc root folder to image build root folder
+    # Required by bootc CI to build bootc binary
+    # And Required by Fedora CI for some folders for test
     cp -a ../../. "$BOOTC_TEMPDIR"
 
     # TMT needs this key
@@ -40,31 +60,15 @@ if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
     ls -al "$BOOTC_TEMPDIR"
 
     CONTAINERFILE=${BOOTC_TEMPDIR}/Containerfile
-    tee "$CONTAINERFILE" > /dev/null << REALEOF
-FROM $TIER1_IMAGE_URL as build
-
-COPY contrib /contrib
-COPY hack/build.sh /build.sh
-RUN /build.sh && rm -v /build.sh
-COPY . /build
-WORKDIR /build
-
-RUN mkdir -p /build/target/dev-rootfs
-RUN --mount=type=cache,target=/build/target --mount=type=cache,target=/var/roothome make test-bin-archive && mkdir -p /out && cp target/bootc.tar.zst /out
-
-FROM $TIER1_IMAGE_URL
 
+    COMMON_CONTAINERFILE="${BOOTC_TEMPDIR}/common_containerfile"
+    tee "$COMMON_CONTAINERFILE" > /dev/null << COMMONEOF
 COPY hack/provision-derived.sh /tmp
 RUN /tmp/provision-derived.sh && rm -f /tmp/*.sh
 # Also copy in some default install configs we use for testing
 COPY hack/install-test-configs/* /usr/lib/bootc/install/
 # And some test kargs
 COPY hack/test-kargs /usr/lib/bootc/kargs.d/
-# Inject our built code
-COPY --from=build /out/bootc.tar.zst /tmp
-RUN tar -C / --zstd -xvf /tmp/bootc.tar.zst && rm -vrf /tmp/*
-# Also copy over arbitrary bits from the target root
-COPY --from=build /build/target/dev-rootfs/ /
 
 RUN <<EORUN
 set -xeuo pipefail
@@ -91,7 +95,51 @@ COPY bin /usr/local/bin
 
 # In Testing Farm, all ssh things should be reserved for ssh command run after reboot
 COPY .ssh /var/roothome/.ssh
+COMMONEOF
+
+    if [[ -v KOJI_TASK_ID ]] || [[ -v CI_KOJI_TASK_ID ]]; then
+        FEDORA_CI_CONTAINERFILE="${BOOTC_TEMPDIR}/fedora_ci_containerfile"
+        tee "$FEDORA_CI_CONTAINERFILE" > /dev/null << FEDORACIEOF
+FROM $TIER1_IMAGE_URL
+
+COPY $BOOTC_RPM_FILE_NAME /$BOOTC_RPM_FILE_NAME
+COPY $SYSTEM_REINSTALL_BOOTC_RPM_FILE_NAME /$SYSTEM_REINSTALL_BOOTC_RPM_FILE_NAME
+RUN dnf remove -y bootc system-reinstall-bootc && dnf install -y /$BOOTC_RPM_FILE_NAME /$SYSTEM_REINSTALL_BOOTC_RPM_FILE_NAME rpm-ostree
+FEDORACIEOF
+        cat >"$CONTAINERFILE" <<REALEOF
+$(cat "$FEDORA_CI_CONTAINERFILE")
+$(cat "$COMMON_CONTAINERFILE")
+
 REALEOF
+    else
+        BOOTC_CI_CONTAINERFILE="${BOOTC_TEMPDIR}/bootc_ci_containerfile"
+        tee "$BOOTC_CI_CONTAINERFILE" > /dev/null << BOOTCCIEOF
+FROM $TIER1_IMAGE_URL as build
+
+COPY contrib /contrib
+COPY hack/build.sh /build.sh
+RUN /build.sh && rm -v /build.sh
+COPY . /build
+WORKDIR /build
+
+RUN mkdir -p /build/target/dev-rootfs
+RUN --mount=type=cache,target=/build/target --mount=type=cache,target=/var/roothome make test-bin-archive && mkdir -p /out && cp target/bootc.tar.zst /out
+
+FROM $TIER1_IMAGE_URL
+
+# Inject our built code
+COPY --from=build /out/bootc.tar.zst /tmp
+RUN tar -C / --zstd -xvf /tmp/bootc.tar.zst && rm -vrf /tmp/*
+# Also copy over arbitrary bits from the target root
+COPY --from=build /build/target/dev-rootfs/ /
+
+BOOTCCIEOF
+        cat >"$CONTAINERFILE" <<REALEOF
+$(cat "$BOOTC_CI_CONTAINERFILE")
+$(cat "$COMMON_CONTAINERFILE")
+REALEOF
+    fi
+
 
     if [[ -d "/var/ARTIFACTS" ]]; then
         # In Testing Farm, TMT work dir /var/ARTIFACTS should be reserved