From 7ba09cf1ac8434283eac9b82acb13de4b84e8cc0 Mon Sep 17 00:00:00 2001 From: flacatus Date: Fri, 11 Oct 2024 12:15:09 +0200 Subject: [PATCH] Change pipelinesruns to use EAS to provision clusters --- .../pipelines/konflux-e2e-tests-pipeline.yaml | 207 +++++++----------- 1 file changed, 75 insertions(+), 132 deletions(-) diff --git a/integration-tests/pipelines/konflux-e2e-tests-pipeline.yaml b/integration-tests/pipelines/konflux-e2e-tests-pipeline.yaml index f5c25f1c7f..8089e2882d 100644 --- a/integration-tests/pipelines/konflux-e2e-tests-pipeline.yaml +++ b/integration-tests/pipelines/konflux-e2e-tests-pipeline.yaml @@ -48,16 +48,6 @@ spec: default: 'quay.io/redhat-user-workloads/konflux-qe-team-tenant/konflux-e2e/konflux-e2e-tests:latest' description: 'Konflux e2e tests container. Contain the ginkgo binary to run the e2e tests in any Konflux component.' tasks: - - name: rosa-hcp-metadata - 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/rosa/hosted-cp/rosa-hcp-metadata/rosa-hcp-metadata.yaml - name: test-metadata taskRef: resolver: git @@ -88,138 +78,91 @@ spec: 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)" - operator: in - values: ["pull_request"] - runAfter: - - rosa-hcp-metadata - - create-oci-container - - test-metadata + - name: provision-eaas-space taskRef: resolver: git params: - name: url - value: https://github.com/konflux-ci/konflux-qe-definitions.git + value: https://github.com/konflux-ci/build-definitions.git - name: revision value: main - name: pathInRepo - value: common/tasks/rosa/hosted-cp/rosa-hcp-provision/rosa-hcp-provision.yaml + value: task/eaas-provision-space/0.1/eaas-provision-space.yaml params: - - name: cluster-name - value: "$(tasks.rosa-hcp-metadata.results.cluster-name)" - - name: ocp-version - value: "$(params.ocp-version)" - - name: replicas - value: "$(params.replicas)" - - name: machine-type - value: "$(params.machine-type)" - - name: konflux-test-infra-secret - value: "$(params.konflux-test-infra-secret)" - - name: cloud-credential-key - value: "$(params.cloud-credential-key)" - - name: konflux-e2e-tests - timeout: 3h - when: - - input: "$(tasks.test-metadata.results.test-event-type)" - operator: in - values: ["pull_request"] + - name: ownerName + value: $(context.pipelineRun.name) + - name: ownerUid + value: $(context.pipelineRun.uid) + - name: provision-cluster runAfter: - - provision-rosa - taskRef: - resolver: git - params: - - name: url - value: https://github.com/konflux-ci/e2e-tests.git - - name: revision - value: main - - name: pathInRepo - value: integration-tests/tasks/konflux-e2e-tests-task.yaml - params: - - name: test-name - value: "$(context.pipelineRun.name)" - - name: git-repo - value: "$(tasks.test-metadata.results.git-repo)" - - name: git-url - value: "$(tasks.test-metadata.results.git-url)" - - name: git-revision - value: "$(tasks.test-metadata.results.git-revision)" - - name: oras-container - value: "$(tasks.create-oci-container.results.oci-container)" - - name: job-spec - value: "$(tasks.test-metadata.results.job-spec)" - - name: ocp-login-command - value: "$(tasks.provision-rosa.results.ocp-login-command)" - - name: component-image - value: "$(tasks.test-metadata.results.container-image)" - - name: container-image - value: "$(params.container-image)" + - provision-eaas-space + taskSpec: + results: + - name: clusterName + value: "$(steps.create-cluster.results.clusterName)" + volumes: + - name: credentials + emptyDir: {} + steps: + - name: get-supported-versions + ref: + resolver: git + params: + - name: url + value: https://github.com/konflux-ci/build-definitions.git + - name: revision + value: main + - name: pathInRepo + value: stepactions/eaas-get-supported-ephemeral-cluster-versions/0.1/eaas-get-supported-ephemeral-cluster-versions.yaml + params: + - name: eaasSpaceSecretRef + value: $(tasks.provision-eaas-space.results.secretRef) + - name: pick-version + ref: + resolver: git + params: + - name: url + value: https://github.com/konflux-ci/build-definitions.git + - name: revision + value: main + - name: pathInRepo + value: stepactions/eaas-get-latest-openshift-version-by-prefix/0.1/eaas-get-latest-openshift-version-by-prefix.yaml + params: + - name: prefix + value: "$(steps.get-supported-versions.results.versions[0])." + - name: create-cluster + ref: + resolver: git + params: + - name: url + value: https://github.com/konflux-ci/build-definitions.git + - name: revision + value: main + - name: pathInRepo + value: stepactions/eaas-create-ephemeral-cluster-hypershift-aws/0.1/eaas-create-ephemeral-cluster-hypershift-aws.yaml + params: + - name: eaasSpaceSecretRef + value: $(tasks.provision-eaas-space.results.secretRef) + - name: version + value: "$(steps.pick-version.results.version)" + - name: get-kubeconfig + ref: + resolver: git + params: + - name: url + value: https://github.com/konflux-ci/build-definitions.git + - name: revision + value: main + - name: pathInRepo + value: stepactions/eaas-get-ephemeral-cluster-credentials/0.1/eaas-get-ephemeral-cluster-credentials.yaml + params: + - name: eaasSpaceSecretRef + value: $(tasks.provision-eaas-space.results.secretRef) + - name: clusterName + value: "$(steps.create-cluster.results.clusterName)" + - name: credentials + value: credentials finally: - - name: deprovision-rosa-collect-artifacts - when: - - input: "$(tasks.test-metadata.results.test-event-type)" - operator: in - values: ["pull_request"] - 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/rosa/hosted-cp/rosa-hcp-deprovision/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)" - - name: pull-request-author - value: "$(tasks.test-metadata.results.pull-request-author)" - - name: git-revision - value: "$(tasks.test-metadata.results.git-revision)" - - name: pull-request-number - value: "$(tasks.test-metadata.results.pull-request-number)" - - name: git-repo - value: "$(tasks.test-metadata.results.git-repo)" - - name: git-org - value: "$(tasks.test-metadata.results.git-org)" - - name: cluster-name - value: "$(tasks.rosa-hcp-metadata.results.cluster-name)" - - name: konflux-test-infra-secret - value: "$(params.konflux-test-infra-secret)" - - name: cloud-credential-key - value: "$(params.cloud-credential-key)" - - name: pipeline-aggregate-status - value: "$(tasks.status)" - - name: quality-dashboard-upload - when: - - input: "$(tasks.test-metadata.results.test-event-type)" - operator: in - values: ["pull_request"] - 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/quality-dashboard/0.1/quality-dashboard-upload.yaml - params: - - name: test-name - value: "$(context.pipelineRun.name)" - - name: oci-container - value: "$(tasks.create-oci-container.results.oci-container)" - - name: quality-dashboard-api - value: $(params.quality-dashboard-api) - - name: pipeline-aggregate-status - value: "$(tasks.status)" - - name: test-event-type - value: "$(tasks.test-metadata.results.test-event-type)" - name: pull-request-status-message when: - input: "$(tasks.test-metadata.results.test-event-type)"