fixes for real run

rvykydal · Mar 12, 2024 · 55171d0 · 55171d0
1 parent 67a1d8d
commit 55171d0
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/.github/workflows/test-platforms.yml b/.github/workflows/test-platforms.yml
@@ -73,7 +73,8 @@ jobs:
       GITHUB_TOKEN: /home/github/github-token
     strategy:
       matrix:
-        platform: [daily-iso, rawhide, rhel8, rhel9]
+        #platform: [daily-iso, rawhide, rhel8, rhel9]
+        platform: [daily-iso]
       fail-fast: false
 
     steps:
@@ -133,7 +134,7 @@ jobs:
           echo "changed_tests=${CHANGED_TESTS}" >> $GITHUB_OUTPUT
 
       - name: Get skipped tests for platform ${{ matrix.platform }}
-        id: get_platform_skiptest
+        id: get_platform_specs
         working-directory: ./kickstart-tests
         run: |
           set -eux
@@ -142,15 +143,19 @@ jobs:
           if [ ${{ matrix.platform }} == "daily-iso" ]; then
             echo "skip_tests=skip-on-fedora" >> $GITHUB_OUTPUT
             echo "disabled_testtypes=$SKIP_TESTTYPES_DAILY_ISO" >> $GITHUB_OUTPUT
+            echo "platform=rawhide" >> $GITHUB_OUTPUT
           elif [ ${{ matrix.platform }} == "rawhide" ]; then
             echo "skip_tests=skip-on-fedora" >> $GITHUB_OUTPUT
             echo "disabled_testtypes=$SKIP_TESTTYPES_RAWHIDE" >> $GITHUB_OUTPUT
+            echo "platform=rawhide" >> $GITHUB_OUTPUT
           elif [ ${{ matrix.platform }} == "rhel8" ]; then
             echo "skip_tests=skip-on-rhel,skip-on-rhel-8" >> $GITHUB_OUTPUT
             echo "disabled_testtypes=$SKIP_TESTTYPES_RHEL8" >> $GITHUB_OUTPUT
+            echo "platform=rhel8" >> $GITHUB_OUTPUT
           elif [ ${{ matrix.platform }} == "rhel9" ]; then
             echo "skip_tests=skip-on-rhel,skip-on-rhel-9" >> $GITHUB_OUTPUT
             echo "disabled_testtypes=$SKIP_TESTTYPES_RHEL9" >> $GITHUB_OUTPUT
+            echo "platform=rhel9" >> $GITHUB_OUTPUT
           else
             echo "Platform is not supported by kickstart tests yet!"
             exit 1
@@ -163,7 +168,7 @@ jobs:
           set -eux
 
           CHANGED_TESTS="${{steps.get_changed_tests.outputs.changed_tests }}"
-          DISABLED_TESTTYPES="${{ steps.get_platform_skiptest.outputs.disabled_testtypes }}"
+          DISABLED_TESTTYPES="${{ steps.get_platform_specs.outputs.disabled_testtypes }}"
           LAUNCH_ARGS="${{ needs.pr-info.outputs.launch_args }}"
 
           if [ -n "${LAUNCH_ARGS}" ]; then
@@ -182,7 +187,7 @@ jobs:
           source ./containers/runner/skip-testtypes
           PERMIAN_QUERY=$(scripts/generate-permian-query.py \
              --skip-testtypes $SKIP_TESTTYPES_ANACONDA_PR \
-             --skip-testtypes ${{ steps.get_platform_skiptest.outputs.skip_tests }} \
+             --skip-testtypes ${{ steps.get_platform_specs.outputs.skip_tests }} \
              ${LAUNCH_ARGS} )
           if [ $? == 0 ]; then
             echo "launch_args=$LAUNCH_ARGS" >> $GITHUB_OUTPUT
@@ -272,9 +277,9 @@ jobs:
                 "configurations":[{"architecture":"x86_64"}],
                 "point_person":"rvykydal@redhat.com"
               },
-              ${{ steps.boot_iso_from_platform.outputs.boot_iso }}
+              ${{ steps.boot_iso_for_platform.outputs.boot_iso }}
               "kstestParams":{
-                "platform":"${{ matrix.platform }}",
+                "platform":"${{ steps.get_platform_specs.outputs.platform }}",
                 "urls":{
                   "x86_64":{
                     "installation_tree":"${{ steps.set_installation_urls.outputs.installation_tree }}",