[rpms/gcc] rhel-f41-base: CI Tests: Make the CI testplan more compact

[Martin Cermak <mcermak@redhat.com>]

A new commit has been pushed.

Repo   : rpms/gcc
Branch : rhel-f41-base
Commit : cf965d214e6c8e061b67edfe9d875b8d7edf9da7
Author : Martin Cermak <mcermak@redhat.com>
Date   : 2023-03-24T09:46:16+01:00
Stats  : +58/-60 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/gcc/c/cf965d214e6c8e061b67edfe9d875b8d7edf9da7?branch=rhel-f41-base

Log:
CI Tests:  Make the CI testplan more compact

---
diff --git a/plans/ci.fmf b/plans/ci.fmf
index 85710d6..13b60db 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -2,5 +2,9 @@ summary: CI Gating Plan
 discover:
     how: fmf
     directory: tests
+prepare:
+    - name: prepare
+      how: shell
+      script: ./plans/prepare.sh
 execute:
     how: tmt

diff --git a/plans/ci/prepare/prepare.fmf b/plans/ci/prepare/prepare.fmf
deleted file mode 100755
index 0b8da9f..0000000
--- a/plans/ci/prepare/prepare.fmf
+++ /dev/null
@@ -1,6 +0,0 @@
-summary: Setup task
-prepare:
-    script: ./plans/ci/prepare/prepare.sh
-require:
-- koji
-- dnf-utils

diff --git a/plans/ci/prepare/prepare.sh b/plans/ci/prepare/prepare.sh
deleted file mode 100755
index 8ffb6ef..0000000
--- a/plans/ci/prepare/prepare.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-#
-# Setup task for Fedora CI system.  Install the x86_64 GCC build under test
-# along with its respective i686 (compat arch) bits needed for the testing.
-# KOJI_TASK_ID per https://github.com/fedora-ci/dist-git-pipeline/pull/50 .
-#
-
-set -x
-
-true "V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V"
-
-echo "KOJI_TASK_ID=$KOJI_TASK_ID"
-
-. /etc/os-release
-
-if [ "$ID" == "fedora" ] && [ "$(arch)" == "x86_64" ]; then
-
-    if [ -z "${KOJI_TASK_ID}" ]; then
-        echo "Missing koji task ID, skipping ..."
-        exit 0
-    fi
-
-    tmpd=`mktemp -d`
-    pushd $tmpd
-        koji download-task $KOJI_TASK_ID --noprogress --arch=src
-        ls
-        VR=$(rpm -qp gcc* --queryformat='%{version}-%{release}')
-    popd
-    rm -rf $tmpd
-
-    tmpd=`mktemp -d`
-    pushd $tmpd
-        koji download-task $KOJI_TASK_ID --noprogress --arch=x86_64 --arch=noarch
-        rm -f *debuginfo*
-        ls
-        dnf -y install *.rpm
-    popd
-    rm -rf $tmpd
-
-    tmpd=`mktemp -d`
-    pushd $tmpd
-        koji download-task $KOJI_TASK_ID --noprogress --arch=i686
-        rm -f *debuginfo*
-        ls
-        yum -y install libgcc-$VR* libgfortran-$VR* libgomp-$VR* libitm-$VR* \
-                       libstdc++-devel-$VR* libstdc++-$VR* libstdc++-static-$VR*
-    popd
-    rm -rf $tmpd
-else
-    echo "Not Fedora x86_64, skipping..."
-fi
-
-true "^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^"

diff --git a/plans/prepare.sh b/plans/prepare.sh
new file mode 100755
index 0000000..8ffb6ef
--- /dev/null
+++ b/plans/prepare.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+#
+# Setup task for Fedora CI system.  Install the x86_64 GCC build under test
+# along with its respective i686 (compat arch) bits needed for the testing.
+# KOJI_TASK_ID per https://github.com/fedora-ci/dist-git-pipeline/pull/50 .
+#
+
+set -x
+
+true "V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V-V"
+
+echo "KOJI_TASK_ID=$KOJI_TASK_ID"
+
+. /etc/os-release
+
+if [ "$ID" == "fedora" ] && [ "$(arch)" == "x86_64" ]; then
+
+    if [ -z "${KOJI_TASK_ID}" ]; then
+        echo "Missing koji task ID, skipping ..."
+        exit 0
+    fi
+
+    tmpd=`mktemp -d`
+    pushd $tmpd
+        koji download-task $KOJI_TASK_ID --noprogress --arch=src
+        ls
+        VR=$(rpm -qp gcc* --queryformat='%{version}-%{release}')
+    popd
+    rm -rf $tmpd
+
+    tmpd=`mktemp -d`
+    pushd $tmpd
+        koji download-task $KOJI_TASK_ID --noprogress --arch=x86_64 --arch=noarch
+        rm -f *debuginfo*
+        ls
+        dnf -y install *.rpm
+    popd
+    rm -rf $tmpd
+
+    tmpd=`mktemp -d`
+    pushd $tmpd
+        koji download-task $KOJI_TASK_ID --noprogress --arch=i686
+        rm -f *debuginfo*
+        ls
+        yum -y install libgcc-$VR* libgfortran-$VR* libgomp-$VR* libitm-$VR* \
+                       libstdc++-devel-$VR* libstdc++-$VR* libstdc++-static-$VR*
+    popd
+    rm -rf $tmpd
+else
+    echo "Not Fedora x86_64, skipping..."
+fi
+
+true "^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^-^"