sriov lane release branches, ensure cluster teardown

Sriov lane uses KIND infrastructure. In order to prevent resources leak it is recommanded to use 'kind' binary to teardown the cluster [1], which is what 'make cluster-down' does. [1] kubernetes-sigs/kind#759 Signed-off-by: Or Mergi <ormergi@redhat.com>
ormergi · Dec 14, 2020 · 168c783 · 168c783
1 parent 9ecdc4a
commit 168c783
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 39 deletions.
diff --git a/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.30.yaml b/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.30.yaml
@@ -392,11 +392,19 @@ presubmits:
             topologyKey: kubernetes.io/hostname
       containers:
       - command:
-        - /usr/local/bin/runner.sh
-        - /bin/sh
-        - -c
-        - |
-          apt update && apt install gettext-base -y && wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz && tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ && export PATH=/usr/local/go/bin:$PATH && export TARGET=kind-k8s-sriov-1.17.0 && automation/test.sh
+        - "/usr/local/bin/runner.sh"
+        - "/bin/bash"
+        - "-c"
+        - >
+            apt update &&
+            apt install gettext-base -y &&
+            wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S &&
+            tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ &&
+            export PATH=/usr/local/go/bin:$PATH &&
+            export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 &&
+            export TARGET=kind-k8s-sriov-1.17.0;
+            trap "echo teardown && make cluster-down" EXIT ERR SIGINT SIGTERM;
+            automation/test.sh;
         image: kubevirtci/bootstrap:v20201119-a5880e0
         name: ""
         resources:

diff --git a/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.31.yaml b/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.31.yaml
@@ -423,11 +423,19 @@ presubmits:
             topologyKey: kubernetes.io/hostname
       containers:
       - command:
-        - /usr/local/bin/runner.sh
-        - /bin/sh
-        - -c
-        - |
-          apt update && apt install gettext-base -y && wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz && tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ && export PATH=/usr/local/go/bin:$PATH && export TARGET=kind-k8s-sriov-1.17.0 && automation/test.sh
+        - "/usr/local/bin/runner.sh"
+        - "/bin/bash"
+        - "-c"
+        - >
+            apt update &&
+            apt install gettext-base -y &&
+            wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S &&
+            tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ &&
+            export PATH=/usr/local/go/bin:$PATH &&
+            export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 &&
+            export TARGET=kind-k8s-sriov-1.17.0;
+            trap "echo teardown && make cluster-down" EXIT ERR SIGINT SIGTERM;
+            automation/test.sh;
         image: kubevirtci/bootstrap:v20201119-a5880e0
         name: ""
         resources:

diff --git a/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.32.yaml b/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.32.yaml
@@ -423,11 +423,19 @@ presubmits:
             topologyKey: kubernetes.io/hostname
       containers:
       - command:
-        - /usr/local/bin/runner.sh
-        - /bin/sh
-        - -c
-        - |
-          apt update && apt install gettext-base -y && wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz && tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ && export PATH=/usr/local/go/bin:$PATH && export TARGET=kind-k8s-sriov-1.17.0 && automation/test.sh
+        - "/usr/local/bin/runner.sh"
+        - "/bin/bash"
+        - "-c"
+        - >
+            apt update &&
+            apt install gettext-base -y &&
+            wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S &&
+            tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ &&
+            export PATH=/usr/local/go/bin:$PATH &&
+            export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 &&
+            export TARGET=kind-k8s-sriov-1.17.0;
+            trap "echo teardown && make cluster-down" EXIT ERR SIGINT SIGTERM;
+            automation/test.sh;
         image: kubevirtci/bootstrap:v20201119-a5880e0
         name: ""
         resources:
@@ -474,10 +482,19 @@ presubmits:
     spec:
       containers:
       - command:
-        - /usr/local/bin/runner.sh
-        - /bin/sh
-        - -c
-        - export TARGET=kind-k8s-1.17.0-ipv6 && automation/test.sh
+        - "/usr/local/bin/runner.sh"
+        - "/bin/bash"
+        - "-c"
+        - >
+          apt update &&
+          apt install gettext-base -y &&
+          wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S &&
+          tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ &&
+          export PATH=/usr/local/go/bin:$PATH &&
+          export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 &&
+          export TARGET=kind-k8s-sriov-1.17.0;
+          trap "echo teardown && make cluster-down" EXIT ERR SIGINT SIGTERM;
+          automation/test.sh;
         image: kubevirtci/bootstrap:v20201119-a5880e0
         name: ""
         resources:

diff --git a/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.33.yaml b/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.33.yaml
@@ -422,11 +422,19 @@ presubmits:
             topologyKey: kubernetes.io/hostname
       containers:
       - command:
-        - /usr/local/bin/runner.sh
-        - /bin/sh
-        - -c
-        - |
-          apt update && apt install gettext-base -y && wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz && tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ && export PATH=/usr/local/go/bin:$PATH && export TARGET=kind-k8s-sriov-1.17.0 && automation/test.sh
+        - "/usr/local/bin/runner.sh"
+        - "/bin/bash"
+        - "-c"
+        - >
+            apt update &&
+            apt install gettext-base -y &&
+            wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S &&
+            tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ &&
+            export PATH=/usr/local/go/bin:$PATH &&
+            export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 &&
+            export TARGET=kind-k8s-sriov-1.17.0;
+            trap "echo teardown && make cluster-down" EXIT ERR SIGINT SIGTERM;
+            automation/test.sh;
         image: kubevirtci/bootstrap:v20201119-a5880e0
         name: ""
         resources:

diff --git a/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.34.yaml b/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.34.yaml
@@ -454,11 +454,19 @@ presubmits:
             topologyKey: kubernetes.io/hostname
       containers:
       - command:
-        - /usr/local/bin/runner.sh
-        - /bin/sh
-        - -c
-        - |
-          apt update && apt install gettext-base -y && wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz && tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ && export PATH=/usr/local/go/bin:$PATH && export TARGET=kind-k8s-sriov-1.17.0 && automation/test.sh
+        - "/usr/local/bin/runner.sh"
+        - "/bin/bash"
+        - "-c"
+        - >
+            apt update &&
+            apt install gettext-base -y &&
+            wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S &&
+            tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ &&
+            export PATH=/usr/local/go/bin:$PATH &&
+            export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 &&
+            export TARGET=kind-k8s-sriov-1.17.0;
+            trap "echo teardown && make cluster-down" EXIT ERR SIGINT SIGTERM;
+            automation/test.sh;
         image: kubevirtci/bootstrap:v20201119-a5880e0
         name: ""
         resources:

diff --git a/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.35.yaml b/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.35.yaml
@@ -179,11 +179,19 @@ presubmits:
             topologyKey: kubernetes.io/hostname
       containers:
       - command:
-        - /usr/local/bin/runner.sh
-        - /bin/sh
-        - -c
-        - |
-          apt update && apt install gettext-base -y && wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S && tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ && export PATH=/usr/local/go/bin:$PATH && export TARGET=kind-k8s-sriov-1.17.0 && automation/test.sh
+        - "/usr/local/bin/runner.sh"
+        - "/bin/bash"
+        - "-c"
+        - >
+            apt update &&
+            apt install gettext-base -y &&
+            wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S &&
+            tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ &&
+            export PATH=/usr/local/go/bin:$PATH &&
+            export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 &&
+            export TARGET=kind-k8s-sriov-1.17.0;
+            trap "echo teardown && make cluster-down" EXIT ERR SIGINT SIGTERM;
+            automation/test.sh;
         image: kubevirtci/bootstrap:v20201119-a5880e0
         name: ""
         resources:

diff --git a/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.36.yaml b/github/ci/prow/files/jobs/kubevirt/kubevirt/kubevirt-presubmits-0.36.yaml
@@ -179,11 +179,19 @@ presubmits:
             topologyKey: kubernetes.io/hostname
       containers:
       - command:
-        - /usr/local/bin/runner.sh
-        - /bin/bash
-        - -c
-        - |
-          apt update && apt install gettext-base -y && wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S && tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ && export PATH=/usr/local/go/bin:$PATH && export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 && export TARGET=kind-k8s-sriov-1.17.0; trap "echo teardown && make cluster-down" EXIT ERR SIGINT SIGTERM; automation/test.sh;
+        - "/usr/local/bin/runner.sh"
+        - "/bin/bash"
+        - "-c"
+        - >
+            apt update &&
+            apt install gettext-base -y &&
+            wget https://dl.google.com/go/go1.13.8.linux-amd64.tar.gz -nv -S &&
+            tar -xzf go1.13.8.linux-amd64.tar.gz -C /usr/local/ &&
+            export PATH=/usr/local/go/bin:$PATH &&
+            export KUBEVIRT_PROVIDER=kind-k8s-sriov-1.17.0 &&
+            export TARGET=kind-k8s-sriov-1.17.0;
+            trap "echo teardown && make cluster-down" EXIT ERR SIGINT SIGTERM;
+            automation/test.sh;
         image: kubevirtci/bootstrap:v20201119-a5880e0
         name: ""
         resources: