diff --git a/integration-tests/pipelines/konflux-e2e-tests-pipeline.yaml b/integration-tests/pipelines/konflux-e2e-tests-pipeline.yaml index d620bc9e..c461404b 100644 --- a/integration-tests/pipelines/konflux-e2e-tests-pipeline.yaml +++ b/integration-tests/pipelines/konflux-e2e-tests-pipeline.yaml @@ -51,7 +51,7 @@ spec: resolver: git params: - name: url - value: https://github.com/konflux-ci/konflux-qe-definitions.git + value: https://github.com/konflux-ci/tekton-integration-catalog.git - name: revision value: main - name: pathInRepo @@ -61,7 +61,7 @@ spec: resolver: git params: - name: url - value: https://github.com/konflux-ci/konflux-qe-definitions.git + value: https://github.com/konflux-ci/tekton-integration-catalog.git - name: revision value: main - name: pathInRepo @@ -71,21 +71,6 @@ spec: value: $(params.SNAPSHOT) - name: test-name value: $(context.pipelineRun.name) - - name: create-oci-container - taskRef: - resolver: git - params: - - name: url - value: https://github.com/konflux-ci/konflux-qe-definitions.git - - name: revision - value: main - - name: pathInRepo - value: common/tasks/create-oci-artifact/0.1/create-oci-artifact.yaml - params: - - name: oci-container-repo - value: $(params.oci-container-repo) - - name: oci-container-tag - value: $(context.pipelineRun.name) - name: provision-rosa when: - input: "$(tasks.test-metadata.results.test-event-type)" @@ -97,16 +82,15 @@ spec: runAfter: - rosa-hcp-metadata - test-metadata - - create-oci-container taskRef: resolver: git params: - name: url - value: https://github.com/konflux-ci/konflux-qe-definitions.git + value: https://github.com/konflux-ci/tekton-integration-catalog.git - name: revision value: main - name: pathInRepo - value: common/tasks/rosa/hosted-cp/rosa-hcp-provision/rosa-hcp-provision.yaml + value: tasks/rosa/hosted-cp/rosa-hcp-provision/0.2/rosa-hcp-provision.yaml params: - name: cluster-name value: "$(tasks.rosa-hcp-metadata.results.cluster-name)" @@ -120,6 +104,8 @@ spec: value: "$(params.konflux-test-infra-secret)" - name: cloud-credential-key value: "$(params.cloud-credential-key)" + - name: oci-container + value: "$(params.oci-container-repo):$(context.pipelineRun.name)" - name: konflux-e2e-tests timeout: 3h when: @@ -150,7 +136,7 @@ spec: - name: git-revision value: "$(tasks.test-metadata.results.git-revision)" - name: oras-container - value: "$(tasks.create-oci-container.results.oci-container)" + value: "$(params.oci-container-repo):$(context.pipelineRun.name)" - name: job-spec value: "$(tasks.test-metadata.results.job-spec)" - name: ocp-login-command @@ -170,18 +156,18 @@ spec: resolver: git params: - name: url - value: https://github.com/konflux-ci/konflux-qe-definitions.git + value: https://github.com/konflux-ci/tekton-integration-catalog.git - name: revision value: main - name: pathInRepo - value: common/tasks/rosa/hosted-cp/rosa-hcp-deprovision/rosa-hcp-deprovision.yaml + value: tasks/rosa/hosted-cp/rosa-hcp-deprovision/0.2/rosa-hcp-deprovision.yaml params: - name: test-name value: "$(context.pipelineRun.name)" - name: ocp-login-command value: "$(tasks.provision-rosa.results.ocp-login-command)" - name: oci-container - value: "$(tasks.create-oci-container.results.oci-container)" + value: "$(params.oci-container-repo):$(context.pipelineRun.name)" - name: pull-request-author value: "$(tasks.test-metadata.results.pull-request-author)" - name: git-revision @@ -212,7 +198,7 @@ spec: resolver: git params: - name: url - value: https://github.com/konflux-ci/konflux-qe-definitions.git + value: https://github.com/konflux-ci/tekton-integration-catalog.git - name: revision value: main - name: pathInRepo @@ -221,7 +207,7 @@ spec: - name: test-name value: "$(context.pipelineRun.name)" - name: oci-container - value: "$(tasks.create-oci-container.results.oci-container)" + value: "$(params.oci-container-repo):$(context.pipelineRun.name)" - name: quality-dashboard-api value: $(params.quality-dashboard-api) - name: pipeline-aggregate-status @@ -240,7 +226,7 @@ spec: resolver: git params: - name: url - value: https://github.com/konflux-ci/konflux-qe-definitions.git + value: https://github.com/konflux-ci/tekton-integration-catalog.git - name: revision value: main - name: pathInRepo @@ -249,7 +235,7 @@ spec: - name: test-name value: "$(context.pipelineRun.name)" - name: oci-container - value: "$(tasks.create-oci-container.results.oci-container)" + value: "$(params.oci-container-repo):$(context.pipelineRun.name)" - name: pipeline-aggregate-status value: "$(tasks.status)" - name: pull-request-author @@ -262,3 +248,11 @@ spec: value: "$(tasks.test-metadata.results.git-org)" - name: git-revision value: "$(tasks.test-metadata.results.git-revision)" + - name: junit-report-name + value: e2e-report.xml + - name: e2e-log-name + value: e2e-tests.log + - name: cluster-provision-log-name + value: cluster-provision.log + - name: enable-test-results-analysis + value: "true"