diff --git a/.github/workflows/windows-e2e.yml b/.github/workflows/windows-e2e.yml index 0154e2df70..072c0c5523 100644 --- a/.github/workflows/windows-e2e.yml +++ b/.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,9 +18,11 @@ 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: diff --git a/.github/workflows/windows-qe-tpl.yml b/.github/workflows/windows-qe-tpl.yml index 20e447cdfe..6741a8fb73 100644 --- a/.github/workflows/windows-qe-tpl.yml +++ b/.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: @@ -36,20 +36,15 @@ 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 id: download-gh-context-artifact uses: dawidd6/action-download-artifact@v3 with: - workflow: ${{inputs.workflow_id}} + workflow: ${{inputs.trigger-workflow-id}} - name: Set environment for the run run: |