fix1

.github/workflows/linux-qe-template.yml

@@ -49,8 +49,6 @@ jobs:
           status_context="${status_context}/Linux-ARM64"
           echo "status_context=${status_context}" >> "$GITHUB_ENV"
 
-          echo "${PULL_SECRET}" > pull-secret
-
       - name: Download linux binary
         uses: actions/download-artifact@v4
         with:
@@ -86,6 +84,8 @@ jobs:
           TESTING_FARM_API_TOKEN: ${{ secrets.TESTING_FARM_API_TOKEN }}
           PULL_SECRET: ${{ secrets.PULL_SECRET }}
         run: |
+          echo "${PULL_SECRET}" > pull-secret
+
           # the target can only be accessed through a bastion (which can only be accessed from self-hosted runner) 
           # as so we need to map the ssh-agent from the host to the containers used to access the target host
           rm -f id_rsa id_rsa.pub
@@ -97,7 +97,7 @@ jobs:
 
           # reserve machine from testing farm
           export TESTING_FARM_API_TOKEN=${TESTING_FARM_API_TOKEN}
-          testing-farm reserve --compose Fedora-40 --duration 240 --arch aarch64 --hardware memory='>= 12 GB' --hardware virtualization.is-supported='true' --ssh-public-key id_rsa.pub --no-autoconnect | tee info
+          testing-farm reserve --compose Fedora-40 --duration 480 --arch aarch64 --hardware memory='>= 12 GB' --hardware virtualization.is-supported='true' --ssh-public-key id_rsa.pub --no-autoconnect | tee info
           machine=`tail -n 1 info`
           echo ${machine##*@} > host
           echo crctest > username
@@ -107,16 +107,19 @@ jobs:
           echo ${request:1} > requestid
 
           # Create a non-root user for testing on the reserved machine
-          ssh_cmd="ssh -i id_rsa ${machine##*ssh}"
+          ssh_cmd="ssh -i id_rsa -o StrictHostKeyChecking=no ${machine##*ssh}"
+          echo ${machine##*ssh}
+          echo $ssh_cmd
           $ssh_cmd 'useradd crctest' < /dev/null
           $ssh_cmd 'echo "crctest:redhat" | chpasswd' < /dev/null
           $ssh_cmd 'usermod -aG wheel crctest' < /dev/null
           $ssh_cmd 'echo "crctest ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/crctest-users' < /dev/null
           $ssh_cmd 'mkdir -p /home/crctest/.ssh' < /dev/null
           $ssh_cmd 'cp /root/.ssh/authorized_keys /home/crctest/.ssh/' < /dev/null
-          $ssh_cmd 'chown crctest /home/crctest/.ssh/authorized_keys' < /dev/null
+          $ssh_cmd 'chown -R crctest:crctest /home/crctest/.ssh/'  < /dev/null
 
           # Install CRC on the reserved machine
+          echo "Start installing crc on reserved machine"
           podman run --rm -d --privileged --name crc-linux-install-${{inputs.qe-type}}-${{inputs.preset}} \
             -e TARGET_HOST=$(cat host) \
             -e TARGET_HOST_USERNAME=$(cat username) \
@@ -132,25 +135,63 @@ jobs:
             -v ${PWD}:/data:z \
             -v ${PWD}/crc:/opt/crc-support/crc:z \
             quay.io/crc-org/ci-crc-support:v2.0.0-dev-linux crc-support/run.sh \
-             -targetPath "/root/crc-support" \
+             -targetPath "/home/crctest/crc-support" \
              -install 'true' \
              -aName 'crc' \
              -freshEnv 'false' \
              -download 'false' 
           podman logs -f crc-linux-install-${{inputs.qe-type}}-${{inputs.preset}}
 
+          # Download arm64 bundle in the reserved machine
+          echo "Start download bundle on reserved machine"
+          bundle_url="https://crc-bundle-arm64.s3.us-east-1.amazonaws.com"
+          if [[ "${{inputs.preset}}" == "microshift" ]]; then
+            bundle_name="crc_microshift_libvirt_4.17.3_arm64.crcbundle"
+          else
+            bundle_name="crc_libvirt_4.17.3_arm64.crcbundle"
+          fi
+          podman run --rm -d --privileged --name download_bundle \
+            -e TARGET_HOST=$(cat host) \
+            -e TARGET_HOST_USERNAME=$(cat username) \
+            -e TARGET_HOST_KEY_PATH=/data/id_rsa \
+            -e BASTION_HOST_USERNAME=$(cat bastion_username) \
+            -e BASTION_HOST=$(cat bastion_host) \
+            -e TARGET_FOLDER=crc-support \
+            -e TARGET_CLEANUP='false' \
+            -e OUTPUT_FOLDER=/data \
+            -e DEBUG='true' \
+            -e SSH_AUTH_SOCK=$(cat ssh_auth_sock) \
+            -v "$(cat ssh_auth_sock):$(cat ssh_auth_sock)" \
+            -v ${PWD}:/data:z \
+            quay.io/crc-org/ci-crc-support:v2.0.0-dev-linux crc-support/run.sh \
+             -targetPath "/home/crctest" \
+             -install 'false' \
+             -aBaseURL $bundle_url \
+             -aName $bundle_name \
+             -freshEnv 'false' \
+             -download 'true' 
+          podman logs -f download_bundle
+
           # load image
           podman load -i crc-${{inputs.qe-type}}-linux-arm64.tar
+          $ssh_cmd 'chmod +x /usr/local/bin/crc' < /dev/null
 
           # run CRC test
-          cmd="crc-qe/run.sh -junitFilename crc-${{inputs.qe-type}}-junit.xml -targetFolder crc-qe"
+          cmd="crc-qe/run.sh -bundleLocation /home/crctest/$bundle_name -junitFilename crc-${{inputs.qe-type}}-junit.xml -targetFolder crc-qe"
           if [[ "${{inputs.qe-type}}" == "e2e" ]]; then
             if [[ "${{inputs.preset}}" == "microshift" ]]; then
               cmd="${cmd} -e2eTagExpression '@story_microshift'"
             else
               cmd="${cmd} -e2eTagExpression '~@minimal && ~@story_microshift'"
             fi
+          else
+            if [[ "${{inputs.preset}}" == "microshift" ]]; then
+              cmd="${cmd} -labelFilter 'microshift-preset'"
+            else
+              cmd="${cmd} -labelFilter 'openshift-preset'"
+            fi
           fi
+          echo "Start running test on reserved machine"
           podman run --rm -d --privileged --name crc-${{inputs.qe-type}}-${{inputs.preset}} \
             -e TARGET_HOST=$(cat host) \
             -e TARGET_HOST_USERNAME=$(cat username) \
@@ -190,6 +231,17 @@ jobs:
             **/*.results
             **/*.log
 
+      - name: Return machine and clear env
+        env: 
+          TESTING_FARM_API_TOKEN: ${{ secrets.TESTING_FARM_API_TOKEN }}
+        if: always()
+        run: |
+          export TESTING_FARM_API_TOKEN=${TESTING_FARM_API_TOKEN}
+          testing-farm cancel $(cat requestid) 
+          podman rmi quay.io/crcont/crc-${{inputs.qe-type}}:gh-linux-arm64
+          rm -r results
+          kill $(cat ssh_agent_pid)
+
       - name: Update status of the PR check
         if: always()
         run: |
@@ -209,12 +261,7 @@ jobs:
             https://api.github.com/repos/${{ github.repository }}/statuses/${{ env.commit_sha }} \
             -d "${data}"
 
-      - name: Return machine and clear env
-        env: 
-          TESTING_FARM_API_TOKEN: ${{ secrets.TESTING_FARM_API_TOKEN }}
-        run: |
-          export TESTING_FARM_API_TOKEN=${TESTING_FARM_API_TOKEN}
-          testing-farm cancel $(cat requestid) 
+      
 
 
 

.github/workflows/linux-qe-test.yml

@@ -16,14 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         qe-type: ['e2e','integration']
-        preset: ['openshift', 'microshift', 'all']
-        exclude:
-        - qe-type: 'e2e'
-          preset: 'all'
-        - qe-type: 'integration'
-          preset: 'openshift'
-        - qe-type: 'integration'
-          preset: 'microshift'
+        preset: ['openshift', 'microshift']
     with:
       trigger-workflow-run-id: ${{ github.event.workflow_run.id }}
       qe-type: ${{matrix.qe-type}}