Skip to content

Commit

Permalink
RHIDP-4811 Enable Tekton pipelines and update API version (#1947)
Browse files Browse the repository at this point in the history
Remove checkPipelineOutput function from Tekton tests
  • Loading branch information
gustavolira authored Nov 22, 2024
1 parent a182baf commit b555189
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
12 changes: 12 additions & 0 deletions .ibm/pipelines/openshift-ci-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
name: hello-world-pipeline-run
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: tekton.dev/v1beta1
apiVersion: tekton.dev/v1
kind: Pipeline
metadata:
name: hello-world-pipeline
Expand Down
6 changes: 3 additions & 3 deletions .ibm/pipelines/value_files/values_showcase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions e2e-tests/playwright/e2e/plugins/tekton/tekton.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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!",
]);
});
});
6 changes: 0 additions & 6 deletions e2e-tests/playwright/utils/tekton/tekton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

0 comments on commit b555189

Please sign in to comment.