ci(tmachine): run conformance with Podman tests

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

.github/workflows/branch-e2e.yml

@@ -223,6 +223,10 @@ jobs:
     with:
       test-matrix: >-
         [
+          {
+            "scenario":"fedora-podman-rootful",
+            "testsuite":"conformance"
+          },
           {
             "scenario":"fedora-podman-rootful",
             "testsuite":"provider-refresh"

.github/workflows/release-dev.yml

@@ -106,10 +106,8 @@ jobs:
     permissions:
       actions: read
       contents: read
-    uses: ./.github/workflows/conformance.yml
-    with:
-      scenarios: '["ubuntu-docker-rootful", "fedora-podman-rootful", "fedora-podman-rootless"]'
-      testsuites: '["smoke"]'
+      packages: read
+    uses: ./.github/workflows/tmachine-test.yml
 
   docker-e2e:
     needs: [build-binaries, build-images]
@@ -134,6 +132,10 @@ jobs:
     with:
       test-matrix: >-
         [
+          {
+            "scenario":"fedora-podman-rootful",
+            "testsuite":"conformance"
+          },
           {
             "scenario":"fedora-podman-rootful",
             "testsuite":"provider-refresh"
@@ -151,14 +153,6 @@ jobs:
       checkout-ref: ${{ github.sha }}
       conformance-artifact-prefix: openshell-conformance
 
-  conformance:
-    needs: [build-binaries, build-sandbox-image, build-supervisor-image]
-    permissions:
-      actions: read
-      contents: read
-      packages: read
-    uses: ./.github/workflows/tmachine-test.yml
-
   tag-ghcr-dev:
     name: Tag GHCR Images as Dev
     needs: [build-images, release-dev]

.github/workflows/release-tag.yml

@@ -152,6 +152,10 @@ jobs:
     with:
       test-matrix: >-
         [
+          {
+            "scenario":"fedora-podman-rootful",
+            "testsuite":"conformance"
+          },
           {
             "scenario":"fedora-podman-rootful",
             "testsuite":"provider-refresh"
@@ -169,6 +173,13 @@ jobs:
       checkout-ref: ${{ needs.compute-versions.outputs.source_sha }}
       conformance-artifact-prefix: openshell-conformance
 
+  conformance:
+    needs: [build-binaries, build-images]
+    permissions:
+      actions: read
+      contents: read
+      packages: read
+    uses: ./.github/workflows/tmachine-test.yml
   tag-ghcr-release:
     name: Tag GHCR Images
     needs: [compute-versions, build-images, release]

.github/workflows/tmachine-test.yml

@@ -17,9 +17,9 @@ on:
         type: string
         default: >-
           [
-            {"scenario":"ubuntu-docker-rootful","testsuite":"smoke"},
-            {"scenario":"fedora-podman-rootful","testsuite":"smoke"},
-            {"scenario":"fedora-podman-rootless","testsuite":"smoke"}
+            {"scenario":"ubuntu-docker-rootful","testsuite":"conformance"},
+            {"scenario":"fedora-podman-rootful","testsuite":"conformance"},
+            {"scenario":"fedora-podman-rootless","testsuite":"conformance"}
           ]
   workflow_dispatch:
     inputs:
@@ -34,9 +34,9 @@ on:
         type: string
         default: >-
           [
-            {"scenario":"ubuntu-docker-rootful","testsuite":"smoke"},
-            {"scenario":"fedora-podman-rootful","testsuite":"smoke"},
-            {"scenario":"fedora-podman-rootless","testsuite":"smoke"}
+            {"scenario":"ubuntu-docker-rootful","testsuite":"conformance"},
+            {"scenario":"fedora-podman-rootful","testsuite":"conformance"},
+            {"scenario":"fedora-podman-rootless","testsuite":"conformance"}
           ]
 
 permissions: