Some changes to CI:

- removed k8s 1.10.3, use 1.10.4 instead - added k8s 1.11.0 Signed-off-by: Marc Sluiter <[email protected]>
mhenriks · Jul 26, 2018 · cc599c9 · cc599c9
1 parent ba2f89b
commit cc599c9
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 76 deletions.
diff --git a/automation/check-patch.k8s-1.10.3-dev.mounts → ...ion/check-patch.k8s-1.10.4-release.mounts b/automation/check-patch.k8s-1.10.3-dev.mounts → ...ion/check-patch.k8s-1.10.4-release.mounts
diff --git a/...ation/check-patch.k8s-1.10.3-dev.packages → ...n/check-patch.k8s-1.10.4-release.packages b/...ation/check-patch.k8s-1.10.3-dev.packages → ...n/check-patch.k8s-1.10.4-release.packages
diff --git a/automation/check-patch.k8s-1.10.3-dev.sh → automation/check-patch.k8s-1.10.4-release.sh b/automation/check-patch.k8s-1.10.3-dev.sh → automation/check-patch.k8s-1.10.4-release.sh
diff --git a/...ion/check-patch.k8s-1.10.3-release.mounts → automation/check-patch.k8s-1.11.0-dev.mounts b/...ion/check-patch.k8s-1.10.3-release.mounts → automation/check-patch.k8s-1.11.0-dev.mounts
diff --git a/...n/check-patch.k8s-1.10.3-release.packages → ...ation/check-patch.k8s-1.11.0-dev.packages b/...n/check-patch.k8s-1.10.3-release.packages → ...ation/check-patch.k8s-1.11.0-dev.packages
diff --git a/automation/check-patch.k8s-1.10.3-release.sh → automation/check-patch.k8s-1.11.0-dev.sh b/automation/check-patch.k8s-1.10.3-release.sh → automation/check-patch.k8s-1.11.0-dev.sh
diff --git a/automation/check-patch.k8s-1.11.0-release.mounts b/automation/check-patch.k8s-1.11.0-release.mounts
@@ -0,0 +1 @@
+check-patch.mounts
diff --git a/automation/check-patch.k8s-1.11.0-release.packages b/automation/check-patch.k8s-1.11.0-release.packages
@@ -0,0 +1 @@
+check-patch.packages.el7
diff --git a/automation/check-patch.k8s-1.11.0-release.sh b/automation/check-patch.k8s-1.11.0-release.sh
@@ -0,0 +1 @@
+check-patch.sh
diff --git a/automation/test.sh b/automation/test.sh
@@ -36,10 +36,10 @@ if [[ $TARGET =~ openshift-.* ]]; then
   else
     export KUBEVIRT_PROVIDER="os-3.10.0"
   fi
-elif [[ $TARGET =~ .*-1.9.3-.* ]]; then
-  export KUBEVIRT_PROVIDER="k8s-1.9.3"
+elif [[ $TARGET =~ .*-1.10.4-.* ]]; then
+  export KUBEVIRT_PROVIDER="k8s-1.10.4"
 else
-  export KUBEVIRT_PROVIDER="k8s-1.10.3"
+  export KUBEVIRT_PROVIDER="k8s-1.11.0"
 fi
 
 export KUBEVIRT_NUM_NODES=2

diff --git a/cluster/k8s-1.10.3/README.md b/cluster/k8s-1.10.3/README.md
diff --git a/cluster/k8s-1.10.3/provider.sh b/cluster/k8s-1.10.3/provider.sh
diff --git a/cluster/k8s-1.11.0/provider.sh b/cluster/k8s-1.11.0/provider.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-image="k8s-1.11.0@sha256:1e936a35d84102f96253002e463c6142c3422f4d6012ef4bdcc5e9cd6a63d359"
+image="k8s-1.11.0@sha256:6c1caf5559eb02a144bf606de37eb0194c06ace4d77ad4561459f3bde876151c"
 
 source cluster/ephemeral-provider-common.sh
 

diff --git a/hack/config.sh b/hack/config.sh
@@ -2,7 +2,7 @@ unset binaries docker_images docker_prefix docker_tag manifest_templates \
     master_ip network_provider kubeconfig manifest_docker_prefix namespace
 
 KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-${PROVIDER}}
-KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.10.3}
+KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.10.4}
 
 source ${KUBEVIRT_PATH}hack/config-default.sh source ${KUBEVIRT_PATH}hack/config-${KUBEVIRT_PROVIDER}.sh
 

diff --git a/stdci.yaml b/stdci.yaml
@@ -1,7 +1,8 @@
 ---
 sub-stages:
-  - k8s-1.10.3-dev
-  - k8s-1.10.3-release
+  - k8s-1.10.4-release
+  - k8s-1.11.0-dev
+  - k8s-1.11.0-release
   - openshift-3.10-release
   - windows2016-release
 runtime_requirements:
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ @@
     set -e
-    image="k8s-1.11.0@sha256:1e936a35d84102f96253002e463c6142c3422f4d6012ef4bdcc5e9cd6a63d359"
+    image="k8s-1.11.0@sha256:6c1caf5559eb02a144bf606de37eb0194c06ace4d77ad4561459f3bde876151c"
     source cluster/ephemeral-provider-common.sh
@@ Expand Down @@