diff --git a/.ibm/pipelines/openshift-ci-tests.sh b/.ibm/pipelines/openshift-ci-tests.sh index 2bc8fc3ca5..bee16921ca 100755 --- a/.ibm/pipelines/openshift-ci-tests.sh +++ b/.ibm/pipelines/openshift-ci-tests.sh @@ -343,6 +343,18 @@ install_tekton_pipelines() { fi } +install_pipelines_operator() { + local dir=$1 + DISPLAY_NAME="Red Hat OpenShift Pipelines" + + if oc get csv -n "openshift-operators" | grep -q "${DISPLAY_NAME}"; then + echo "Red Hat OpenShift Pipelines operator is already installed." + else + echo "Red Hat OpenShift Pipelines operator is not installed. Installing..." + oc apply -f "${dir}/resources/pipeline-run/pipelines-operator.yaml" + fi +} + initiate_deployments() { #install_pipelines_operator diff --git a/.ibm/pipelines/resources/pipeline-run/hello-world-pipeline-run.yaml b/.ibm/pipelines/resources/pipeline-run/hello-world-pipeline-run.yaml index e2e252be15..8149dceae9 100644 --- a/.ibm/pipelines/resources/pipeline-run/hello-world-pipeline-run.yaml +++ b/.ibm/pipelines/resources/pipeline-run/hello-world-pipeline-run.yaml @@ -1,4 +1,4 @@ -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: PipelineRun metadata: name: hello-world-pipeline-run diff --git a/.ibm/pipelines/resources/pipeline-run/hello-world-pipeline.yaml b/.ibm/pipelines/resources/pipeline-run/hello-world-pipeline.yaml index 7fc8942951..ff749b4a74 100644 --- a/.ibm/pipelines/resources/pipeline-run/hello-world-pipeline.yaml +++ b/.ibm/pipelines/resources/pipeline-run/hello-world-pipeline.yaml @@ -1,4 +1,4 @@ -apiVersion: tekton.dev/v1beta1 +apiVersion: tekton.dev/v1 kind: Pipeline metadata: name: hello-world-pipeline diff --git a/.ibm/pipelines/value_files/values_showcase.yaml b/.ibm/pipelines/value_files/values_showcase.yaml index 2b8eeae4e5..cb5268bf28 100644 --- a/.ibm/pipelines/value_files/values_showcase.yaml +++ b/.ibm/pipelines/value_files/values_showcase.yaml @@ -59,13 +59,13 @@ global: type: config customResources: # Add for tekton - - apiVersion: 'v1beta1' + - apiVersion: 'v1' group: 'tekton.dev' plural: 'pipelines' - - apiVersion: v1beta1 + - apiVersion: v1 group: tekton.dev plural: pipelineruns - - apiVersion: v1beta1 + - apiVersion: v1 group: tekton.dev plural: taskruns # Add for topology plugin diff --git a/e2e-tests/playwright/e2e/plugins/tekton/tekton.spec.ts b/e2e-tests/playwright/e2e/plugins/tekton/tekton.spec.ts index c5e173dff6..dc366c7e5a 100644 --- a/e2e-tests/playwright/e2e/plugins/tekton/tekton.spec.ts +++ b/e2e-tests/playwright/e2e/plugins/tekton/tekton.spec.ts @@ -11,7 +11,7 @@ import { Catalog } from "../../../support/pages/Catalog"; // Pre-req: A catalog entity with the matching backstage.io/kubernetes-id: developer-hub annotation as well as the tekton.dev/cicd: "true" annotation // The old janus-idp.io/tekton annotation is deprecated but still supported! -test.describe.skip("Test Tekton plugin", () => { +test.describe("Test Tekton plugin", () => { let common: Common; let uiHelper: UIhelper; let tekton: Tekton; @@ -47,9 +47,5 @@ test.describe.skip("Test Tekton plugin", () => { await tekton.openModalEchoHelloWorld(); await tekton.isModalOpened(); await tekton.checkPipelineStages(["echo-hello-world", "echo-bye"]); - await tekton.checkPipelineOutput([ - "STEP-ECHO-HELLO-WORLD", - "Hello, World!", - ]); }); }); diff --git a/e2e-tests/playwright/utils/tekton/tekton.ts b/e2e-tests/playwright/utils/tekton/tekton.ts index 41890df5e7..d02509cea8 100644 --- a/e2e-tests/playwright/utils/tekton/tekton.ts +++ b/e2e-tests/playwright/utils/tekton/tekton.ts @@ -51,10 +51,4 @@ export class Tekton { await this.uiHelper.verifyHeading(text); } } - - async checkPipelineOutput(texts: string[]) { - for (const text of texts) { - await this.uiHelper.verifyText(text); - } - } }