Fix upgrade-tests pipeline

Roming22 · xinredhat · commit 573268b9d5af · 2023-09-14T20:57:13.000+08:00
The wrong set of scripts were used when deploying/testing the
baseline branch. Scripts from the baseline branch are now used
when testing the baseline branch, and scripts from the PR are
used when testing the PR branch.

However CI related scripts always use the source branch, so that any
changes in the CI scripts and/or pipeline definitions work as expected.

* Fix issue with a sidecar script that was not called from the sidecar.
* Change target of source code copy to /workspace/source on the sidecar
* Copy sidecar scripts to /workspace/sidecar on the sidecar
* Checkout the revision being tested before setup and test
* Rename ci-runner-container-setup.yaml to setup-ci-runner-container.yaml
so filename and taskname match

Signed-off-by: Romain Arnaud &lt;rarnaud@redhat.com&gt;
diff --git a/.tekton/pipeline-service-test.yaml b/.tekton/pipeline-service-test.yaml
@@ -7,7 +7,7 @@ metadata:
     pipelinesascode.tekton.dev/on-event: "[pull_request, push]"
     pipelinesascode.tekton.dev/on-target-branch: "[refs/heads/*]"
     pipelinesascode.tekton.dev/pipeline: "[.tekton/pipeline/acceptance-tests.yaml]"
-    pipelinesascode.tekton.dev/task: "[.tekton/tasks/ci-runner-container-setup.yaml]"
+    pipelinesascode.tekton.dev/task: "[.tekton/tasks/setup-ci-runner-container.yaml]"
     pipelinesascode.tekton.dev/task-1: "[.tekton/tasks/deploy-cluster.yaml]"
     pipelinesascode.tekton.dev/task-2: "[.tekton/tasks/destroy-cluster.yaml]"
     pipelinesascode.tekton.dev/task-3: "[.tekton/tasks/destroy-existing-cluster.yaml]"
diff --git a/.tekton/pipeline-service-upgrade-test.yaml b/.tekton/pipeline-service-upgrade-test.yaml
@@ -7,15 +7,14 @@ metadata:
     pipelinesascode.tekton.dev/on-event: "[pull_request, push]"
     pipelinesascode.tekton.dev/on-target-branch: "[refs/heads/*]"
     pipelinesascode.tekton.dev/pipeline: "[.tekton/pipeline/upgrade-tests.yaml]"
-    pipelinesascode.tekton.dev/task: "[.tekton/tasks/ci-runner-container-setup.yaml]"
+    pipelinesascode.tekton.dev/task: "[.tekton/tasks/setup-ci-runner-container.yaml]"
     pipelinesascode.tekton.dev/task-1: "[.tekton/tasks/deploy-cluster.yaml]"
     pipelinesascode.tekton.dev/task-2: "[.tekton/tasks/destroy-cluster.yaml]"
     pipelinesascode.tekton.dev/task-3: "[.tekton/tasks/destroy-existing-cluster.yaml]"
     pipelinesascode.tekton.dev/task-4: "[.tekton/tasks/generate-cluster-name.yaml]"
     pipelinesascode.tekton.dev/task-5: "[.tekton/tasks/pipeline-service-setup.yaml]"
     pipelinesascode.tekton.dev/task-6: "[.tekton/tasks/pipeline-service-tests.yaml]"
-    pipelinesascode.tekton.dev/task-7: "[.tekton/tasks/pipeline-service-upgrade-setup.yaml]"
-    pipelinesascode.tekton.dev/task-8: "[git-clone]"
+    pipelinesascode.tekton.dev/task-7: "[git-clone]"
     pipelinesascode.tekton.dev/max-keep-runs: "5"
 spec:
   pipelineRef:
diff --git a/.tekton/pipeline/acceptance-tests.yaml b/.tekton/pipeline/acceptance-tests.yaml
@@ -89,10 +89,10 @@ spec:
       params:
         - name: repo_url
           value: $(params.repo_url)
-        - name: revision
-          value: $(params.revision)
         - name: target_branch
           value: $(params.target_branch)
+        - name: test_branch
+          value: $(params.revision)
     - name: pipeline-service-tests
       taskRef:
         name: pipeline-service-tests
diff --git a/.tekton/pipeline/upgrade-tests.yaml b/.tekton/pipeline/upgrade-tests.yaml
@@ -63,24 +63,11 @@ spec:
           workspace: source
         - name: kubeconfig-dir
           workspace: upgrade-shared-workspace
-    - name: clone-pipeline-service-git-baseline
-      runAfter:
-        - "setup-ci-runner"
-      taskRef:
-        name: git-clone
-      workspaces:
-        - name: output
-          workspace: source
-      params:
-        - name: url
-          value: $(params.repo_url)
-        - name: revision
-          value: $(params.target_branch)
     - name: plnsvc-setup-baseline
       taskRef:
         name: pipeline-service-setup
       runAfter:
-        - "clone-pipeline-service-git-baseline"
+        - "setup-ci-runner"
       workspaces:
         - name: kubeconfig-dir
           workspace: upgrade-shared-workspace
@@ -89,10 +76,10 @@ spec:
       params:
         - name: repo_url
           value: $(params.repo_url)
-        - name: revision
-          value: $(params.revision)
         - name: target_branch
           value: $(params.target_branch)
+        - name: test_branch
+          value: $(params.target_branch)
     - name: tests-baseline
       taskRef:
         name: pipeline-service-tests
@@ -106,24 +93,11 @@ spec:
           workspace: upgrade-shared-workspace
         - name: source
           workspace: source
-    - name: clone-pipeline-service-git-upgrade
-      runAfter:
-        - "tests-baseline"
-      taskRef:
-        name: git-clone
-      workspaces:
-        - name: output
-          workspace: source
-      params:
-        - name: url
-          value: $(params.repo_url)
-        - name: revision
-          value: $(params.revision)
     - name: plnsvc-setup-upgrade
       taskRef:
-        name: pipeline-service-upgrade-setup
+        name: pipeline-service-setup
       runAfter:
-        - "clone-pipeline-service-git-upgrade"
+        - "tests-baseline"
       workspaces:
         - name: kubeconfig-dir
           workspace: upgrade-shared-workspace
@@ -132,10 +106,10 @@ spec:
       params:
         - name: repo_url
           value: $(params.repo_url)
-        - name: revision
-          value: $(params.revision)
         - name: target_branch
           value: $(params.target_branch)
+        - name: test_branch
+          value: $(params.revision)
     - name: tests-upgrade
       taskRef:
         name: pipeline-service-tests
@@ -149,24 +123,11 @@ spec:
           workspace: upgrade-shared-workspace
         - name: source
           workspace: source
-    - name: clone-pipeline-service-git-downgrade
-      runAfter:
-        - "tests-upgrade"
-      taskRef:
-        name: git-clone
-      workspaces:
-        - name: output
-          workspace: source
-      params:
-        - name: url
-          value: $(params.repo_url)
-        - name: revision
-          value: $(params.target_branch)
     - name: plnsvc-setup-downgrade
       taskRef:
-        name: pipeline-service-upgrade-setup
+        name: pipeline-service-setup
       runAfter:
-        - "clone-pipeline-service-git-downgrade"
+        - "tests-upgrade"
       workspaces:
         - name: kubeconfig-dir
           workspace: upgrade-shared-workspace
@@ -175,10 +136,10 @@ spec:
       params:
         - name: repo_url
           value: $(params.repo_url)
-        - name: revision
-          value: $(params.revision)
         - name: target_branch
           value: $(params.target_branch)
+        - name: test_branch
+          value: $(params.target_branch)
     - name: tests-downgrade
       taskRef:
         name: pipeline-service-tests
diff --git a/.tekton/tasks/pipeline-service-setup.yaml b/.tekton/tasks/pipeline-service-setup.yaml
@@ -6,8 +6,8 @@ metadata:
 spec:
   params:
     - name: repo_url
-    - name: revision
     - name: target_branch
+    - name: test_branch
   workspaces:
     - name: kubeconfig-dir
       description: The kubeconfig of new cluster will be stored onto the volume backing this Workspace
@@ -26,6 +26,6 @@ spec:
         - name: REPO_URL
           value: $(params.repo_url)
         - name: REPO_REVISION
-          value: $(params.revision)
+          value: $(params.test_branch)
       command:
         - ci/images/ci-runner/hack/bin/run-plnsvc-setup.sh
diff --git a/.tekton/tasks/pipeline-service-tests.yaml b/.tekton/tasks/pipeline-service-tests.yaml
@@ -21,4 +21,4 @@ spec:
         - name: KUBECONFIG
           value: "$(workspaces.kubeconfig-dir.path)/kubeconfig"
       command:
-        - ci/images/ci-runner/hack/sidecar/bin/plnsvc_test.sh
+        - ci/images/ci-runner/hack/bin/run-plnsvc-test.sh
diff --git a/.tekton/tasks/pipeline-service-upgrade-setup.yaml b/.tekton/tasks/pipeline-service-upgrade-setup.yaml
diff --git a/.tekton/tasks/setup-ci-runner-container.yaml b/.tekton/tasks/setup-ci-runner-container.yaml
diff --git a/ci/images/ci-runner/hack/bin/copy-plnsvc-code.sh b/ci/images/ci-runner/hack/bin/copy-plnsvc-code.sh
@@ -5,7 +5,10 @@ set -o pipefail
 set -x
 
 echo "Copy source code of pipeline service to the ci-runner container"
-kubectl cp "./" "default/ci-runner:/source"
+kubectl cp "./" "default/ci-runner:/workspace/source"
+
+echo "Copy sidecar sources to the ci-runner container"
+kubectl cp "./ci/images/ci-runner/hack/sidecar" "default/ci-runner:/workspace/sidecar"
 
 echo "Copy new cluster's kubeconfig to the ci-runner container"
 kubectl cp "$KUBECONFIG" "default/ci-runner:/kubeconfig"
diff --git a/ci/images/ci-runner/hack/bin/run-plnsvc-setup.sh b/ci/images/ci-runner/hack/bin/run-plnsvc-setup.sh
@@ -9,4 +9,4 @@ touch "$PWD/destroy-cluster.txt"
 
 echo "Execute dev_setup.sh script to set up pipeline-service ..."
 kubectl -n default exec pod/ci-runner -- \
-    sh -c "/source/ci/images/ci-runner/hack/sidecar/bin/plnsvc_setup.sh $REPO_URL $REPO_REVISION"
+    sh -c "/workspace/sidecar/bin/plnsvc_setup.sh $REPO_URL $REPO_REVISION"
diff --git a/ci/images/ci-runner/hack/bin/run-plnsvc-test.sh b/ci/images/ci-runner/hack/bin/run-plnsvc-test.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -o errexit
+set -o nounset
+set -o pipefail
+set -x
+
+echo "Run pipeline-service tests..."
+if kubectl -n default exec pod/ci-runner -- \
+    sh -c "/workspace/sidecar/bin/plnsvc_test.sh"; then
+
+    # In case the user deleted the file early when they expected a failure
+    if [ -e "$PWD/destroy-cluster.txt" ]; then
+        # If the tests are successful, the cluster can be destroyed right away
+        rm "$PWD/destroy-cluster.txt"
+    fi
+fi
diff --git a/ci/images/ci-runner/hack/manifests/sidecar/pod.yaml b/ci/images/ci-runner/hack/manifests/sidecar/pod.yaml
@@ -24,7 +24,8 @@ spec:
           mountPath: "/run/user/0/containers/"
           readOnly: true
         - name: ci-runner-storage
-          mountPath: "/source"
+          mountPath: "/workspace"
+      workingDir: "/workspace/source"
   volumes:
     - name: pull-secret
       secret:
diff --git a/ci/images/ci-runner/hack/sidecar/bin/plnsvc_setup.sh b/ci/images/ci-runner/hack/sidecar/bin/plnsvc_setup.sh
@@ -11,6 +11,10 @@ REPO_REVISION=$2
 # to avoid the issue of "fatal: detected dubious ownership in repository at '/workspace/source'"
 git config --global --add safe.directory "$PWD"
 
+# Checkout the branch we want to setup
+git fetch origin "$REPO_REVISION"
+git checkout "$REPO_REVISION"
+
 OPENSHIFT_DIR=$(find "$PWD" -type f -name dev_setup.sh -exec dirname {} +)
 CONFIG="$OPENSHIFT_DIR/../config.yaml"
 
diff --git a/ci/images/ci-runner/hack/sidecar/bin/plnsvc_test.sh b/ci/images/ci-runner/hack/sidecar/bin/plnsvc_test.sh
@@ -6,11 +6,4 @@ set -x
 
 echo "Start executing pipeline cases ..."
 TEST_DIR=$(find "$PWD" -type f -name test.sh -exec dirname {} +)
-"$TEST_DIR/test.sh" --kubeconfig "$KUBECONFIG"
-
-
-# In case the user deleted the file early when they expected a failure
-if [ -e "$PWD/destroy-cluster.txt" ]; then
-    # If the tests are successful, the cluster can be destroyed right away
-    rm "$PWD/destroy-cluster.txt"
-fi
+"$TEST_DIR/test.sh" --kubeconfig "/kubeconfig"
