missing files

Signed-off-by: Adrian Riobo Lorenzo <[email protected]>

.github/workflows/windows-artifacts.yml

@@ -36,7 +36,7 @@ jobs:
  - name: Upload windows installer artifact
  uses: actions/upload-artifact@v4
  with:
- name: Windows Installer (${{ matrix.os }})
+ name: windows-installer
  path: "./out/windows-amd64/crc-windows-installer.zip"
 
  build-qe:
@@ -70,13 +70,13 @@ jobs:
  - name: Upload e2e ${{matrix.os}}-${{matrix.arch}}
  uses: actions/upload-artifact@v4
  with:
- name: ${{ env.IMAGE_NAME_E2E }}-gh-${{matrix.os}}-${{matrix.arch}}
+ name: ${{ env.IMAGE_NAME_E2E }}-${{matrix.os}}-${{matrix.arch}}
  path: ${{ env.IMAGE_NAME_E2E }}-${{matrix.os}}-${{matrix.arch}}.tar
 
  - name: Upload integration ${{matrix.os}}-${{matrix.arch}}
  uses: actions/upload-artifact@v4
  with:
- name: ${{ env.IMAGE_NAME_INTEGRATION }}-gh-${{matrix.os}}-${{matrix.arch}}
+ name: ${{ env.IMAGE_NAME_INTEGRATION }}-${{matrix.os}}-${{matrix.arch}}
  path: ${{ env.IMAGE_NAME_INTEGRATION }}-${{matrix.os}}-${{matrix.arch}}.tar
 
  save-gh-context:
@@ -93,5 +93,5 @@ jobs:
  - name: Upload the GH context artifact
  uses: actions/upload-artifact@v4
  with:
- name: gh_context
+ name: gh-context
  path: gh_context.json

.github/workflows/windows-e2e.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
  windows-e2e-ocp:
- uses: adrianriobo/crc/.github/workflows/windows-qe-tpl.yml@fix4040-extended
+ uses: adrianriobo/crc/.github/workflows/windows-qe-tpl.yml@fix-4040-extended
  strategy:
  fail-fast: false
  matrix:
@@ -18,14 +18,12 @@ jobs:
  - qe-type: 'e2e'
  preset: 'all'
  - qe-type: 'integration'
- preset: ['openshift', 'microshift']
+ preset: 'openshift'
+ - qe-type: 'integration'
+ preset: 'microshift'
  with:
- workflow-id: ${{ github.event.workflow_run.workflow_id }}
+ trigger-workflow-id: ${{ github.event.workflow_run.workflow_id }}
  qe-type: ${{matrix.qe-type}}
  preset: ${{matrix.preset}}
- secrets:
- pull-secret: ${{secrets.PULL_SECRET}}
- arm-tenant-id: ${{secrets.ARM_TENANT_ID}}
- arm-subscription-id: ${{secrets.ARM_SUBSCRIPTION_ID}}
- arm-client-id: ${{secrets.ARM_CLIENT_ID}}
- arm-client-secret: ${{secrets.ARM_CLIENT_SECRET}}
+ secrets: inherit
+

.github/workflows/windows-qe-tpl.yml

@@ -5,7 +5,7 @@ name: windows-qe-tpl
 on: 
  workflow_call: 
  inputs: 
- workflow-id: 
+ trigger-workflow-id: 
  required: true 
  type: string
  qe-type: 
@@ -15,17 +15,6 @@ on:
  preset:
  description: preset type only required if qe-type is e2e
  type: string 
- secrets: 
- pull-secret: 
- required: true 
- arm-tenant-id: 
- required: true 
- arm-subscription-id: 
- required: true 
- arm-client-id: 
- required: true 
- arm-client-secret: 
- required: true 
 
 jobs:
  windows-qe:
@@ -36,22 +25,34 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- windows-version: ['10','11']
- windows-featurepack: ['22h2-ent', '23h2-ent']
- exclude:
- - windows-version: '10'
- windows-featurepack: '23h2-ent'
- - windows-version: '11'
- windows-featurepack: '22h2-ent'
+ windows-version: ['11']
+ windows-featurepack: ['23h2-ent']
 
  steps:
- - name: Download artifacts to be tested
+ - name: Download gh context
  id: download-gh-context-artifact
  uses: dawidd6/action-download-artifact@v3
  with:
- workflow: ${{inputs.workflow_id}}
+ workflow: ${{inputs.trigger-workflow-id}}
+ name: gh-context
+
+ - name: Download windows installer
+ id: download-windows-installer-artifact
+ uses: dawidd6/action-download-artifact@v3
+ with:
+ workflow: ${{inputs.trigger-workflow-id}}
+ name: windows-installer
+
+ - name: Download qe oci image
+ id: download-qe-oci-image-artifact
+ uses: dawidd6/action-download-artifact@v3
+ with:
+ workflow: ${{inputs.trigger-workflow-id}}
+ name: crc-${{inputs.qe-type}}-windows-amd64
 
- - name: Set environment for the run
+ - name: Correlate
+ env:
+ PULL_SECRET: ${{ secrets.PULL_SECRET }}
  run: |
  # Get origin commit sha for testing
  commit_sha=$(cat gh_context.json | jq -r '.event.after')
@@ -60,16 +61,25 @@ jobs:
  commit_sha=$(cat gh_context.json | jq -r '.sha')
  fi
  echo "commit_sha=${commit_sha}" >> "$GITHUB_ENV"
+ 
+ # Set status_context
+ status_context="ci/gh/${{inputs.qe-type}}"
+ if [[ "${{inputs.qe-type}}" == "e2e" ]]; then
+ status_context="${status_context}-${{inputs.preset}}"
+ fi
+ status_context="${status_context}/windows-${{matrix.windows-version}}-${{matrix.windows-featurepack}}"
+ echo "status_context=${status_context}" >> "$GITHUB_ENV"
+
  # Save pull-secret as file
- echo ${{secrets.pull-secret}} > pull-secret
+ echo "${PULL_SECRET}" > pull-secret
 
  - name: Add status to the PR check
  run: |
  set -xuo
  # Status msg
- data="{\"state\":\"pending\"
- data="${data},\"description\":\"Running ${{inputs.qe-type}} on Windows\""
- data="${data},\"context\":\"ci/gh/${{inputs.qe-type}}/windows-${{matrix.windows-version}}-${{matrix.windows-featurepack}}\""
+ data="{\"state\":\"pending\""
+ data="${data},\"description\":\"Running ${{inputs.qe-type}}-${{inputs.preset}} on Windows\""
+ data="${data},\"context\":\"${{ env.status_context }}\""
  data="${data},\"target_url\":\"https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}"
  # Create status by API call
  curl -L -v -X POST \
@@ -83,14 +93,16 @@ jobs:
  # Create instance
  podman run -d --name windows-create --rm \
  -v ${PWD}:/workspace:z \
- -e ARM_TENANT_ID=${{secrets.arm-tenant-id}} \
- -e ARM_SUBSCRIPTION_ID=${{secrets.arm-subscription-id}} \
- -e ARM_CLIENT_ID=${{secrets.arm-client-id}} \
- -e ARM_CLIENT_SECRET='${{secrets.arm-client-secret}}' \
+ -e ARM_TENANT_ID=${{secrets.ARM_TENANT_ID}} \
+ -e ARM_SUBSCRIPTION_ID=${{secrets.ARM_SUBSCRIPTION_ID}} \
+ -e ARM_CLIENT_ID=${{secrets.ARM_CLIENT_ID}} \
+ -e ARM_CLIENT_SECRET='${{secrets.ARM_CLIENT_SECRET}}' \
+ -e AZURE_STORAGE_ACCOUNT='${{ secrets.AZURE_STORAGE_ACCOUNT }}' \
+ -e AZURE_STORAGE_KEY='${{ secrets.AZURE_STORAGE_KEY }}' \
  quay.io/rhqp/qenvs:v0.6.3 azure \
  windows create \
- --project-name 'windows-desktop' \
- --backed-url 'file:///workspace' \
+ --project-name 'windows-desktop-${{ matrix.windows-version }}-${{ matrix.windows-featurepack }}-${{inputs.qe-type}}-${{inputs.preset}}' \
+ --backed-url azblob://crc-qenvs-state/${{ env.commit_sha }} \
  --conn-details-output '/workspace' \
  --windows-version '${{matrix.windows-version}}' \
  --windows-featurepack '${{matrix.windows-featurepack}}' \
@@ -122,17 +134,14 @@ jobs:
  # load image
  podman load -i crc-${{inputs.qe-type}}-windows-amd64.tar
  # run
- cmd="crc-qe/run.ps1 -junitFilename crc-${{inputs.qe-type}}-junit.xml "
- if [[ "${inputs.qe-type}" == "e2e" ]]; then
- if [[ "${inputs.preset}" == "openshift" ]]; then
- cmd="$cmd -e2eTagExpression '@story_microshift'"
+ cmd="crc-qe/run.ps1 -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'"
+ cmd="${cmd} -e2eTagExpression '~@minimal && ~@story_microshift'"
  fi
  fi
-
- - name: e2e-tag
- value: "@story_microshift"
  podman run --rm -d --name crc-${{inputs.qe-type}} \
  -e TARGET_HOST=$(cat host) \
  -e TARGET_HOST_USERNAME=$(cat username) \
@@ -143,8 +152,8 @@ jobs:
  -e DEBUG=true \
  -v $PWD/pull-secret:/opt/crc/pull-secret:z \
  -v $PWD:/data:z \
- quay.io/crcont/crc-${{inputs.qe-type}}:gh-windows-amd64  \
- crc-qe/run.ps1 -junitFilename crc-${{inputs.qe-type}}-junit.xml 
+ quay.io/crcont/crc-${{inputs.qe-type}}:gh-windows-amd64 \
+ ${cmd} 
  podman logs -f crc-${{inputs.qe-type}}
 
  - name: Test Report
@@ -162,7 +171,7 @@ jobs:
  uses: actions/upload-artifact@v4
  if: always()
  with:
- name: windows-${{inputs.qe-type}}-${{matrix.windows-version}}${{matrix.windows-featurepack}}
+ name: windows-${{inputs.qe-type}}-${{inputs.preset}}-${{matrix.windows-version}}${{matrix.windows-featurepack}}
  path: |
  **/*.xml
  **/*.results
@@ -173,12 +182,12 @@ jobs:
  run: |
  set -xuo
  # Status msg
- data="{\"state\":\"success\"
+ data="{\"state\":\"success\""
  if [[ ${{steps.test-report.outcome}} != "success" ]]; then 
- data="{\"state\":\"failure\" 
+ data="{\"state\":\"failure\""
  fi
- data="${data},\"description\":\"Finished ${{inputs.qe-type}} on Windows\""
- data="${data},\"context\":\"ci/gh/${{inputs.qe-type}}/windows-${{matrix.windows-version}}-${{matrix.windows-featurepack}}\""
+ data="${data},\"description\":\"Finished ${{inputs.qe-type}}-${{inputs.preset}} on Windows\""
+ data="${data},\"context\":\"${{ env.status_context }}\""
  data="${data},\"target_url\":\"https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}\"}"
  # Create status by API call
  curl -L -v -X POST \
@@ -195,12 +204,14 @@ jobs:
  # Destroy 
  podman run -d --name windows-destroy --rm \
  -v ${PWD}:/workspace:z \
- -e ARM_TENANT_ID=${{secrets.arm-tenant-id}} \
- -e ARM_SUBSCRIPTION_ID=${{secrets.arm-subscription-id}} \
- -e ARM_CLIENT_ID=${{secrets.arm-client-id}} \
- -e ARM_CLIENT_SECRET='${{secrets.arm-client-secret}}' \
+ -e ARM_TENANT_ID=${{secrets.ARM_TENANT_ID}} \
+ -e ARM_SUBSCRIPTION_ID=${{secrets.ARM_SUBSCRIPTION_ID}} \
+ -e ARM_CLIENT_ID=${{secrets.ARM_CLIENT_ID}} \
+ -e ARM_CLIENT_SECRET='${{secrets.ARM_CLIENT_SECRET}}' \
+ -e AZURE_STORAGE_ACCOUNT='${{ secrets.AZURE_STORAGE_ACCOUNT }}' \
+ -e AZURE_STORAGE_KEY='${{ secrets.AZURE_STORAGE_KEY }}' \
  quay.io/rhqp/qenvs:v0.6.3 azure \
  windows destroy \
- --project-name 'windows-desktop' \
- --backed-url 'file:///workspace'
+ --project-name 'windows-desktop-${{ matrix.windows-version }}-${{ matrix.windows-featurepack }}-${{inputs.qe-type}}-${{inputs.preset}}' \
+ --backed-url azblob://crc-qenvs-state/${{ env.commit_sha }} 
  podman logs -f windows-destroy