refactored the code and reduced the number of lines

knative · Sep 26, 2023 · 36ba844 · 36ba844
1 parent 4d481a3
commit 36ba844
Show file tree

Hide file tree

Showing 40 changed files with 112 additions and 336 deletions.
diff --git a/prow/jobs/generated/knative-extensions/kn-plugin-event-main.gen.yaml b/prow/jobs/generated/knative-extensions/kn-plugin-event-main.gen.yaml
@@ -125,12 +125,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative-extensions/kn-plugin-event-release-1.10.gen.yaml b/prow/jobs/generated/knative-extensions/kn-plugin-event-release-1.10.gen.yaml
@@ -200,12 +200,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative-extensions/kn-plugin-event-release-1.11.gen.yaml b/prow/jobs/generated/knative-extensions/kn-plugin-event-release-1.11.gen.yaml
@@ -200,12 +200,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative-extensions/kn-plugin-event-release-1.9.gen.yaml b/prow/jobs/generated/knative-extensions/kn-plugin-event-release-1.9.gen.yaml
@@ -200,12 +200,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/client-main.gen.yaml b/prow/jobs/generated/knative/client-main.gen.yaml
@@ -181,12 +181,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/client-release-1.10.gen.yaml b/prow/jobs/generated/knative/client-release-1.10.gen.yaml
@@ -140,12 +140,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/client-release-1.11.gen.yaml b/prow/jobs/generated/knative/client-release-1.11.gen.yaml
@@ -140,12 +140,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/client-release-1.9.gen.yaml b/prow/jobs/generated/knative/client-release-1.9.gen.yaml
@@ -140,12 +140,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/eventing-main.gen.yaml b/prow/jobs/generated/knative/eventing-main.gen.yaml
@@ -232,12 +232,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh
@@ -308,12 +304,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-rekt-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/eventing-release-1.10.gen.yaml b/prow/jobs/generated/knative/eventing-release-1.10.gen.yaml
@@ -232,12 +232,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh
@@ -308,12 +304,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-rekt-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/eventing-release-1.11.gen.yaml b/prow/jobs/generated/knative/eventing-release-1.11.gen.yaml
@@ -232,12 +232,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh
@@ -308,12 +304,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-rekt-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/eventing-release-1.9.gen.yaml b/prow/jobs/generated/knative/eventing-release-1.9.gen.yaml
@@ -232,12 +232,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh
@@ -308,12 +304,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-rekt-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/operator-main.gen.yaml b/prow/jobs/generated/knative/operator-main.gen.yaml
@@ -140,12 +140,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/operator-release-1.10.gen.yaml b/prow/jobs/generated/knative/operator-release-1.10.gen.yaml
@@ -140,12 +140,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/operator-release-1.11.gen.yaml b/prow/jobs/generated/knative/operator-release-1.11.gen.yaml
@@ -140,12 +140,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/operator-release-1.9.gen.yaml b/prow/jobs/generated/knative/operator-release-1.9.gen.yaml
@@ -140,12 +140,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         ./test/e2e-tests.sh --run-tests
       command:
       - runner.sh

diff --git a/prow/jobs/generated/knative/serving-main.gen.yaml b/prow/jobs/generated/knative/serving-main.gen.yaml
@@ -791,12 +791,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_vm}
         ./test/e2e-tests.sh --run-tests --kourier-version latest
       command:
@@ -876,12 +872,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_vm}
         ./test/e2e-tests.sh --run-tests --contour-version latest
       command:

diff --git a/prow/jobs/generated/knative/serving-release-1.10.gen.yaml b/prow/jobs/generated/knative/serving-release-1.10.gen.yaml
@@ -258,12 +258,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_vm}
         ./test/e2e-tests.sh --run-tests --kourier-version latest
       command:
@@ -343,12 +339,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_vm}
         ./test/e2e-tests.sh --run-tests --contour-version latest
       command:

diff --git a/prow/jobs/generated/knative/serving-release-1.11.gen.yaml b/prow/jobs/generated/knative/serving-release-1.11.gen.yaml
@@ -258,12 +258,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_vm}
         ./test/e2e-tests.sh --run-tests --kourier-version latest
       command:
@@ -343,12 +339,8 @@ periodics:
       - bash
       - -c
       - |
-        cat /opt/cluster/vm-script > /tmp/vm.sh
-        cat /opt/cluster/ci-script > /tmp/connect.sh
-        chmod +x /tmp/vm.sh
-        chmod +x /tmp/connect.sh
-        server_vm=$(. /tmp/vm.sh)
-        . /tmp/connect.sh ${CI_JOB} ${server_vm}
+        server_vm="$(sh /opt/cluster/vm-script)"
+        source /opt/cluster/ci-script "${CI_JOB}" "${server_vm}"
         export TEST_OPTIONS=$TEST_OPTIONS' --ingressendpoint '${server_vm}
         ./test/e2e-tests.sh --run-tests --contour-version latest
       command: