Merge pull request #77 from sclorg/fix_ci_plans

Rename testing plan to centos-stream-10-plan
sclorg · Jan 28, 2025 · 05db4cb · 05db4cb
2 parents de85fbf + ceded8e
commit 05db4cb
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 95 deletions.
diff --git a/.github/workflows/rpm-check.yaml b/.github/workflows/rpm-check.yaml
@@ -39,12 +39,12 @@ jobs:
             compose: "Fedora-41"
             tmt_hardware: '{"gpu": {"device-name": "GH100 (H100)", "vendor-name": "NVIDIA"}}'
             hardware: "GH100"
-          - os: "c9s"
+          - os: "centos-stream-9-plan"
             context: "CentOS Stream 9"
             compose: "CentOS-Stream-9"
             tmt_hardware: ""
             hardware: ""
-          - os: "c10s"
+          - os: "centos-stream-10-plan"
             context: "CentOS Stream 10"
             compose: "CentOS-Stream-10"
             tmt_hardware: ""
@@ -69,7 +69,6 @@ jobs:
           git_url: "https://github.com/sclorg/sclorg-testing-farm"
           git_ref: "main"
           tf_scope: "public"
-          tmt_context: "trigger=code"
           tmt_plan_regex: "${{ matrix.os }}"
           tmt_hardware: "${{ matrix.tmt_hardware }}"
           update_pull_request_status: true

diff --git a/plans/c10s.fmf b/plans/c10s.fmf
@@ -2,6 +2,14 @@ summary: TMT/TFT plan for running container tests on CentOS Stream 10
 description: |
     Run container tests on CentOS Stream 10
 
+discover:
+    how: shell
+    tests:
+    - name: '$OS, container: $REPO_NAME, version: $SINGLE_VERSION'
+      framework: shell
+      test: cd /root/$REPO_NAME && make $TEST_NAME TARGET=$OS SINGLE_VERSION=$SINGLE_VERSION
+      duration: 3h
+
 prepare:
     - name: Clone repository and switch to corresponding PR
       how: shell
@@ -13,51 +21,11 @@ prepare:
         git checkout origin/pr/$PR_NUMBER/head
         git submodule update --init
 
+    - name: Enable repositories and prepare machine for tests
+      how: ansible
+      playbook:
+        - tmt-testing-plan-c10s.yml
+      extra-vars: -vv
+
 execute:
     how: tmt
-
-/test-ci:
-    enabled: true
-    adjust:
-      - because: "Plan to be ran when either executed locally, or executed by CI system"
-        when: >-
-          trigger is defined
-          and trigger == code
-        enabled: false
-    prepare+:
-      - name: Enable repositories and prepare machine for tests
-        how: ansible
-        playbook:
-          - tmt-testing-plan-c10s.yml
-        extra-vars: -vvv
-    discover:
-        how: shell
-        tests:
-        - name: '$OS, container: $REPO_NAME, version: $SINGLE_VERSION'
-          framework: shell
-          test: cd /root/$REPO_NAME && make $TEST_NAME TARGET=$OS SINGLE_VERSION=$SINGLE_VERSION
-          duration: 3h
-
-
-/test-plan:
-    enabled: false
-    adjust:
-      - because: "Plan to be ran for checking if packages and files are present as we want"
-        when: >-
-          trigger is defined
-          and trigger == code
-        enabled: true
-    prepare+:
-      - name: Enable repositories and prepare machine for tests
-        how: shell
-        script: |
-          cd /root/$REPO_NAME
-          git status
-          ansible-playbook --connection=local --inventory=127.0.0.1, --limit=127.0.0.1 tmt-testing-plan-c10s.yml -vvv
-    discover:
-        how: shell
-        tests:
-        - name: Run sclorg-testing-farm tests
-          framework: shell
-          test: cd /root/$REPO_NAME && git status && OS="$OS" ansible-playbook tmt-sclorg-testing-plan.yml
-          duration: 1h
diff --git a/plans/c9s.fmf b/plans/c9s.fmf
@@ -2,6 +2,14 @@ summary: TMT/TFT plan for running container tests on CentOS Stream 9
 description: |
     Run container tests on CentOS Stream 9
 
+discover:
+    how: shell
+    tests:
+    - name: '$OS, container: $REPO_NAME, version: $SINGLE_VERSION'
+      framework: shell
+      test: cd /root/$REPO_NAME && make $TEST_NAME TARGET=$OS SINGLE_VERSION=$SINGLE_VERSION
+      duration: 3h
+
 prepare:
     - name: Clone repository and switch to corresponding PR
       how: shell
@@ -13,51 +21,11 @@ prepare:
         git checkout origin/pr/$PR_NUMBER/head
         git submodule update --init
 
+    - name: Enable repositories and prepare machine for tests
+      how: ansible
+      playbook:
+        - tmt-testing-plan-c9s.yml
+      extra-vars: -vv
+
 execute:
     how: tmt
-
-/test-ci:
-    enabled: true
-    adjust:
-      - because: "Plan to be ran when either executed locally, or executed by CI system"
-        when: >-
-          trigger is defined
-          and trigger == code
-        enabled: false
-    prepare+:
-      - name: Enable repositories and prepare machine for tests
-        how: ansible
-        playbook:
-          - tmt-testing-plan-c9s.yml
-        extra-vars: -vvv
-    discover:
-        how: shell
-        tests:
-        - name: '$OS, container: $REPO_NAME, version: $SINGLE_VERSION'
-          framework: shell
-          test: cd /root/$REPO_NAME && make $TEST_NAME TARGET=$OS SINGLE_VERSION=$SINGLE_VERSION
-          duration: 3h
-
-
-/test-plan:
-    enabled: false
-    adjust:
-      - because: "Plan to be ran for checking if packages and files are present as we want"
-        when: >-
-          trigger is defined
-          and trigger == code
-        enabled: true
-    prepare+:
-      - name: Enable repositories and prepare machine for tests
-        how: shell
-        script: |
-          cd /root/$REPO_NAME
-          git status
-          ansible-playbook --connection=local --inventory=127.0.0.1, --limit=127.0.0.1 tmt-testing-plan-c9s.yml -vvv
-    discover:
-        how: shell
-        tests:
-        - name: Run sclorg-testing-farm tests
-          framework: shell
-          test: cd /root/$REPO_NAME && git status && OS="$OS" ansible-playbook tmt-sclorg-testing-plan.yml
-          duration: 1h
diff --git a/plans/centos-stream-10-plan.fmf b/plans/centos-stream-10-plan.fmf
@@ -0,0 +1,32 @@
+summary: TMT/TFT plan for running container tests on CentOS Stream 10
+description: |
+    Run container tests on CentOS Stream 10
+
+discover:
+    how: shell
+    tests:
+    - name: Run sclorg-testing-farm tests
+      framework: shell
+      test: cd /root/$REPO_NAME && git status && OS="$OS" ansible-playbook tmt-sclorg-testing-plan.yml
+      duration: 1h
+
+prepare:
+    - name: Clone repository and switch to corresponding PR
+      how: shell
+      script: |
+        dnf install -y git ansible-core
+        git clone $REPO_URL /root/$REPO_NAME
+        cd /root/$REPO_NAME
+        git fetch origin +refs/pull/*:refs/remotes/origin/pr/*
+        git checkout origin/pr/$PR_NUMBER/head
+        git submodule update --init
+
+    - name: Enable repositories and prepare machine for tests
+      how: shell
+      script: |
+        cd /root/$REPO_NAME
+        git status
+        ansible-playbook --connection=local --inventory=127.0.0.1, --limit=127.0.0.1 tmt-testing-plan-c10s.yml -vvv
+
+execute:
+    how: tmt
diff --git a/plans/centos-stream-9-plan.fmf b/plans/centos-stream-9-plan.fmf
@@ -0,0 +1,32 @@
+summary: TMT/TFT plan for running container tests on CentOS Stream 9
+description: |
+    Run container tests on CentOS Stream 9
+
+discover:
+    how: shell
+    tests:
+    - name: Run sclorg-testing-farm tests
+      framework: shell
+      test: cd /root/$REPO_NAME && git status && OS="$OS" ansible-playbook tmt-sclorg-testing-plan.yml
+      duration: 1h
+
+prepare:
+    - name: Clone repository and switch to corresponding PR
+      how: shell
+      script: |
+        dnf install -y git ansible
+        git clone $REPO_URL /root/$REPO_NAME
+        cd /root/$REPO_NAME
+        git fetch origin +refs/pull/*:refs/remotes/origin/pr/*
+        git checkout origin/pr/$PR_NUMBER/head
+        git submodule update --init
+
+    - name: Enable repositories and prepare machine for tests
+      how: shell
+      script: |
+        cd /root/$REPO_NAME
+        git status
+        ansible-playbook --connection=local --inventory=127.0.0.1, --limit=127.0.0.1 tmt-testing-plan-c9s.yml -vvv
+
+execute:
+    how: tmt