Merge pull request #22 from mcattamoredhat/update-f39-tests

test: add Fedora-39 tests
mcattamoredhat · May 22, 2024 · 2b8e978 · 2b8e978
2 parents 01f4a15 + df5d088
commit 2b8e978
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 50 deletions.
diff --git a/.github/workflows/fedora-39.yml b/.github/workflows/fedora-39.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   pr-info:
     if: ${{ github.event.issue.pull_request &&
-            (endsWith(github.event.comment.body, '/test-f39') }}
+            (endsWith(github.event.comment.body, '/test-f39')) }}
     runs-on: ubuntu-latest
     steps:
       - name: Query author repository permissions
@@ -64,7 +64,7 @@ jobs:
           git_ref: ${{ needs.pr-info.outputs.ref }}
           update_pull_request_status: true
           pull_request_status_name: "iot-f39-x86"
-          tmt_plan_regex: iot-x86
+          tmt_plan_regex: edge-x86
           tf_scope: private
           secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};OCP4_TOKEN=${{ secrets.OCP4_TOKEN }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}"
           variables: "ARCH=x86_64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1"
@@ -92,7 +92,7 @@ jobs:
           git_ref: ${{ needs.pr-info.outputs.ref }}
           update_pull_request_status: true
           pull_request_status_name: "iot-f39-arm"
-          tmt_plan_regex: iot-arm
+          tmt_plan_regex: edge-arm
           tf_scope: private
           secrets: "DOWNLOAD_NODE=${{ secrets.DOWNLOAD_NODE }};OCP4_TOKEN=${{ secrets.OCP4_TOKEN }};QUAY_USERNAME=${{ secrets.QUAY_USERNAME }};QUAY_PASSWORD=${{ secrets.QUAY_PASSWORD }};DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }};DOCKERHUB_PASSWORD=${{ secrets.DOCKERHUB_PASSWORD }};AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }};AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }};GOVC_URL=${{ secrets.GOVC_URL }};GOVC_USERNAME=${{ secrets.GOVC_USERNAME }};GOVC_PASSWORD=${{ secrets.GOVC_PASSWORD }}"
           variables: "ARCH=x86_64;AWS_DEFAULT_REGION=us-east-1;GOVC_INSECURE=1"
diff --git a/tmt/plans/edge-test.fmf b/tmt/plans/edge-test.fmf
@@ -51,6 +51,8 @@ provision:
   adjust+:
     - when: arch != x86_64
       enabled: false
+    - when: distro == fedora
+      enabled: false
 
 /edge-x86-fdo-db:
   summary: Test edge with fdo package with db
@@ -59,6 +61,8 @@ provision:
   adjust+:
     - when: arch != x86_64
       enabled: false
+    - when: distro == fedora
+      enabled: false
 
 /edge-x86-ignition:
   summary: Test edge ignition feature
@@ -67,6 +71,8 @@ provision:
   adjust+:
     - when: arch != x86_64
       enabled: false
+    - when: distro == fedora
+      enabled: false
 
 /edge-x86-pulp:
   summary: Test edge pulp feature
@@ -75,6 +81,8 @@ provision:
   adjust+:
     - when: arch != x86_64
       enabled: false
+    - when: distro == fedora
+      enabled: false
 
 /edge-x86-vsphere:
   summary: Test edge vsphere image
@@ -83,11 +91,16 @@ provision:
   adjust+:
     - when: arch != x86_64
       enabled: false
+    - when: distro == fedora
+      enabled: false
 
 /edge-x86-ami-image:
   summary: Test edge ami image
   environment+:
     TEST_CASE: edge-ami-image
+  adjust+:
+    - when: distro == fedora
+      enabled: false
 
 /edge-x86-minimal:
   summary: Test edge minimal raw image
@@ -98,51 +111,12 @@ provision:
   summary: Test edge ami image
   environment+:
     TEST_CASE: edge-ami-image
+  adjust+:
+    - when: distro == fedora
+      enabled: false
 
 /edge-arm-minimal:
   summary: Test edge minimal raw image
   environment+:
     TEST_CASE: edge-minimal
 
-/iot-x86-commit:
-  summary: Test iot commit
-  environment+:
-    TEST_CASE: iot-commit
-  adjust+:
-    - when: arch != x86_64
-      enabled: false
-
-/iot-x86-installer:
-  summary: Test iot installer image
-  environment+:
-    TEST_CASE: iot-installer
-  adjust+:
-    - when: arch != x86_64
-      enabled: false
-
-/iot-x86-raw-image:
-  summary: Test iot raw image
-  environment+:
-    TEST_CASE: iot-raw-image
-  adjust+:
-    - when: arch != x86_64
-      enabled: false
-
-/iot-x86-simplified-installer:
-  summary: Test iot simplified installer image
-  environment+:
-    TEST_CASE: iot-simplified-installer
-  adjust+:
-    - when: arch != x86_64
-      enabled: false
-
-/iot-x86-minimal:
-  summary: Test iot minimal raw image
-  environment+:
-    TEST_CASE: iot-minimal
-
-/iot-arm-minimal:
-  summary: Test iot minimal raw image
-  environment+:
-    TEST_CASE: iot-minimal
-
diff --git a/tmt/tests/test.sh b/tmt/tests/test.sh
@@ -4,15 +4,15 @@ set -euox pipefail
 cd ../../ || exit 1
 
 function run_tests() {
-	if [ "$TEST_CASE" = "edge-commit" ] || [ "$TEST_CASE" = "iot-commit" ]; then
+	if [ "$TEST_CASE" = "edge-commit" ]; then
 		./ostree.sh
-	elif [ "$TEST_CASE" = "edge-installer" ] || [ "$TEST_CASE" = "iot-installer" ]; then
+	elif [ "$TEST_CASE" = "edge-installer" ]; then
 		./ostree-ng.sh
-	elif [ "$TEST_CASE" = "edge-raw-image" ] || [ "$TEST_CASE" = "iot-raw-image" ]; then
+	elif [ "$TEST_CASE" = "edge-raw-image" ]; then
 		./ostree-raw-image.sh
 	elif [ "$TEST_CASE" = "edge-ami-image" ]; then
 		./ostree-ami-image.sh
-	elif [ "$TEST_CASE" = "edge-simplified-installer" ] || [ "$TEST_CASE" = "iot-simplified-installer" ]; then
+	elif [ "$TEST_CASE" = "edge-simplified-installer" ]; then
 		./ostree-simplified-installer.sh
 	elif [ "$TEST_CASE" = "edge-vsphere" ]; then
 		./ostree-vsphere.sh
@@ -24,7 +24,7 @@ function run_tests() {
 		./ostree-ignition.sh
 	elif [ "$TEST_CASE" = "edge-pulp" ]; then
 		./ostree-pulp.sh
-	elif [ "$TEST_CASE" = "edge-minimal" ] || [ "$TEST_CASE" = "iot-minimal" ]; then
+	elif [ "$TEST_CASE" = "edge-minimal" ]; then
 		./minimal-raw.sh
 	elif [ "$TEST_CASE" = "edge-8to9" ]; then
 		./ostree-8-to-9.sh