From cf965d214e6c8e061b67edfe9d875b8d7edf9da7 Mon Sep 17 00:00:00 2001 From: Martin Cermak Date: Fri, 24 Mar 2023 09:46:16 +0100 Subject: [PATCH] CI Tests: Make the CI testplan more compact --- plans/ci.fmf | 4 ++++ plans/ci/prepare/prepare.fmf | 6 ------ plans/{ci/prepare => }/prepare.sh | 0 3 files changed, 4 insertions(+), 6 deletions(-) delete mode 100755 plans/ci/prepare/prepare.fmf rename plans/{ci/prepare => }/prepare.sh (100%) 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/prepare.sh similarity index 100% rename from plans/ci/prepare/prepare.sh rename to plans/prepare.sh