Skip to content

Commit 4beb3a2

Browse files
committed
Prepare kantra image extraction
Signed-off-by: Marek Aufart <maufart@redhat.com>
1 parent 24275be commit 4beb3a2

2 files changed

Lines changed: 41 additions & 9 deletions

File tree

.github/workflows/global-ci-bundle.yml

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,14 @@ on:
111111
required: false
112112
type: string
113113
default: main
114+
cli_tests_ref:
115+
description: |
116+
The branch or PR of the CLI tests from kantra-cli-tests repository.
117+
For a pull request, the reference format would be "refs/pull/${PR_NUMBER}/merge".
118+
For a branch, the reference format would just be the branch name.
119+
required: false
120+
type: string
121+
default: latest
114122
ui_tests_ref:
115123
description: |
116124
The branch or PR of the tackle-ui-tests repository to clone.
@@ -518,8 +526,22 @@ jobs:
518526
tackle-ui-tests/cypress/videos
519527
520528
e2e-cli-tests:
521-
uses: konveyor-ecosystem/kantra-cli-tests/.github/workflows/test-suite.yaml@main
522-
with:
523-
tag: latest # take from bundle?
524-
tier: TIER0
525-
529+
needs: check-images
530+
if: ${{ inputs.run_cli_tests }}
531+
runs-on: ubuntu-latest
532+
steps:
533+
- name: extract kantra image URI from bundle
534+
# TODO HERE
535+
536+
- name: Checkout kantra-cli-tests repo to use dynamically on target (release) branch
537+
uses: actions/checkout@v4
538+
with:
539+
repository: konveyor-ecosystem/kantra-cli-tests
540+
ref: ${{ inputs.tag == 'latest' && 'main' || inputs.tag }}
541+
path: kantra-cli-tests
542+
543+
- uses: ./kantra-cli-tests/.github/workflows/test-suite.yaml
544+
with:
545+
image: <TBD> # take from bundle and the full image url
546+
tag: latest # take from bundle tag
547+
tier: TIER0

.github/workflows/global-ci.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,17 @@ jobs:
467467
tackle-ui-tests/cypress/videos
468468
469469
e2e-cli-tests:
470-
uses: konveyor-ecosystem/kantra-cli-tests/.github/workflows/test-suite.yaml@main
471-
with:
472-
tag: ${{ inputs.tag }}
473-
tier: TIER0
470+
if: ${{ inputs.run_cli_tests }}
471+
runs-on: ubuntu-latest
472+
steps:
473+
- name: Checkout kantra-cli-tests repo to use dynamically on target (release) branch
474+
uses: actions/checkout@v4
475+
with:
476+
repository: konveyor-ecosystem/kantra-cli-tests
477+
ref: ${{ inputs.tag == 'latest' && 'main' || inputs.tag }}
478+
path: kantra-cli-tests
479+
480+
- uses: ./kantra-cli-tests/.github/workflows/test-suite.yaml
481+
with:
482+
tag: ${{ inputs.tag }}
483+
tier: TIER0

0 commit comments

Comments
 (0)