From 840d8fb94bcb8652ae7befd1af53f7d09faf765a Mon Sep 17 00:00:00 2001 From: Xin Jiang Date: Wed, 17 Jul 2024 11:39:17 +0800 Subject: [PATCH] for debugging purpose rh-pre-commit.version: 2.1.0 rh-pre-commit.check-secrets: ENABLED --- .tekton/pipeline/test-pipeline-service-deployment.yaml | 6 +++--- .tekton/pipeline/test-pipeline-service-upgrade.yaml | 6 +++--- .tekton/tasks/deploy-cluster.yaml | 2 +- .tekton/test-pipeline-service-deployment-ocp-414.yaml | 2 +- operator/test/test.sh | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.tekton/pipeline/test-pipeline-service-deployment.yaml b/.tekton/pipeline/test-pipeline-service-deployment.yaml index cbf9ca77c..c1718f052 100644 --- a/.tekton/pipeline/test-pipeline-service-deployment.yaml +++ b/.tekton/pipeline/test-pipeline-service-deployment.yaml @@ -89,9 +89,9 @@ spec: taskRef: name: destroy-cluster when: - - input: "$(tasks.deploy-cluster.status)" - operator: notin - values: ["None", "Failed"] + - input: "$(tasks.test-pipeline-service.status)" + operator: in + values: ["Succeeded"] params: - name: cluster-name value: "$(tasks.generate-cluster-name.results.cluster-name)" diff --git a/.tekton/pipeline/test-pipeline-service-upgrade.yaml b/.tekton/pipeline/test-pipeline-service-upgrade.yaml index 20bffd5c0..b6e6d4570 100644 --- a/.tekton/pipeline/test-pipeline-service-upgrade.yaml +++ b/.tekton/pipeline/test-pipeline-service-upgrade.yaml @@ -147,9 +147,9 @@ spec: taskRef: name: destroy-cluster when: - - input: "$(tasks.deploy-cluster.status)" - operator: notin - values: ["None", "Failed"] + - input: "$(tasks.test-baseline.status)" + operator: in + values: ["Succeeded"] params: - name: cluster-name value: "$(tasks.generate-cluster-name.results.cluster-name)" diff --git a/.tekton/tasks/deploy-cluster.yaml b/.tekton/tasks/deploy-cluster.yaml index 79a55bc79..74c44cfb0 100644 --- a/.tekton/tasks/deploy-cluster.yaml +++ b/.tekton/tasks/deploy-cluster.yaml @@ -7,7 +7,7 @@ spec: params: - name: ocp_version description: ocp cluster version that you want to provision - default: "4.14" + default: "4.15" - name: region description: ocp cluster region where you want to provision default: "ca-central-1" diff --git a/.tekton/test-pipeline-service-deployment-ocp-414.yaml b/.tekton/test-pipeline-service-deployment-ocp-414.yaml index 4a2e8d4d0..e256c7af1 100644 --- a/.tekton/test-pipeline-service-deployment-ocp-414.yaml +++ b/.tekton/test-pipeline-service-deployment-ocp-414.yaml @@ -20,7 +20,7 @@ spec: name: test-pipeline-service-deployment params: - name: ocp_version - value: "4.14" + value: "4.15" - name: repo_url value: "{{ repo_url }}" - name: revision diff --git a/operator/test/test.sh b/operator/test/test.sh index fd9b97bd7..3308305e7 100755 --- a/operator/test/test.sh +++ b/operator/test/test.sh @@ -81,7 +81,7 @@ init() { setup_test() { echo "[Setup]" echo -n " - Namespace configuration: " - kubectl apply -k "$SCRIPT_DIR/manifests/setup/pipeline-service" >"$DEBUG_OUTPUT" + kubectl apply -k "$SCRIPT_DIR/manifests/setup/pipeline-service" --v=8 >"$DEBUG_OUTPUT" echo "OK" echo }