Merge pull request #1726 from SchSeba/multus-provider-3.11-and-1.12.2

Added Openshift 3.11 and k8s 1.12.2 with multus providers.

automation/check-patch.openshift-3.11-multus-release.environment.yaml

@@ -0,0 +1 @@
+check-patch.environment.yaml

automation/test.sh

@@ -41,7 +41,7 @@ if [[ $TARGET =~ openshift-.* ]]; then
   if [[ $TARGET =~ .*-crio-.* ]]; then
     export KUBEVIRT_PROVIDER="os-3.11.0-crio"
   elif [[ $TARGET =~ .*-multus-.* ]]; then
-    export KUBEVIRT_PROVIDER="os-3.10.0-multus"
+    export KUBEVIRT_PROVIDER="os-3.11.0-multus"
   else
     export KUBEVIRT_PROVIDER="os-3.11.0"
   fi
@@ -154,7 +154,7 @@ trap '{ make cluster-down; }' EXIT SIGINT SIGTERM SIGSTOP
 
 # Check if we are on a pull request in jenkins.
 export KUBEVIRT_CACHE_FROM=${ghprbTargetBranch}
-if [ -n ${KUBEVIRT_CACHE_FROM} ]; then
+if [ -n "${KUBEVIRT_CACHE_FROM}" ]; then
     make pull-cache
 fi
 

cluster/k8s-multus-1.11.1/README.md → cluster/k8s-multus-1.12.2/README.md

@@ -1,6 +1,6 @@
-# Kubernetes 1.11.1 with multus network plugin in ephemeral containers
+# Kubernetes 1.12.2 with multus network plugin in ephemeral containers
 
-Provides a pre-deployed Kubernetes with version 1.11.1 purely in docker
+Provides a pre-deployed Kubernetes with version 1.12.2 purely in docker
 containers with qemu. The provided VMs are completely ephemeral and are
 recreated on every cluster restart. The KubeVirt containers are built on the
 local machine and are the pushed to a registry which is exposed at
@@ -9,7 +9,7 @@ local machine and are the pushed to a registry which is exposed at
 ## Bringing the cluster up
 
 ```bash
-export KUBEVIRT_PROVIDER=k8s-multus-1.11.1
+export KUBEVIRT_PROVIDER=k8s-multus-1.12.2
 export KUBEVIRT_NUM_NODES=2 # master + one node
 make cluster-up
 ```
@@ -19,14 +19,14 @@ The cluster can be accessed as usual:
 ```bash
 $ cluster/kubectl.sh get nodes
 NAME      STATUS     ROLES     AGE       VERSION
-node01    NotReady   master    31s       v1.11.1
-node02    NotReady   <none>    5s        v1.11.1
+node01    NotReady   master    31s       v1.12.2
+node02    NotReady   <none>    5s        v1.12.2
 ```
 
 ## Bringing the cluster down
 
 ```bash
-export KUBEVIRT_PROVIDER=k8s-multus-1.11.1
+export KUBEVIRT_PROVIDER=k8s-multus-1.12.2
 make cluster-down
 ```
 

cluster/k8s-multus-1.11.1/provider.sh → cluster/k8s-multus-1.12.2/provider.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-image="k8s-multus-1.11.1@sha256:b5f1fa6125f1ad0057284fac433b9f9f0abad3a27214784552d84b6265be20d1"
+image="k8s-multus-1.12.2@sha256:4974496beb19a30156c125d7721912b54a705926dcbf66c41f570dca286996ba"
 
 source cluster/ephemeral-provider-common.sh
 

cluster/os-3.10.0-multus/README.md → cluster/os-3.11.0-multus/README.md

@@ -1,6 +1,6 @@
-# OpenShift 3.10.0 in ephemeral containers
+# OpenShift 3.11.0 in ephemeral containers
 
-Provides a pre-deployed OpenShift Origin with version 3.10.0 purely in docker
+Provides a pre-deployed OpenShift Origin with version 3.11.0 purely in docker
 containers with qemu. The provided VMs are completely ephemeral and are
 recreated on every cluster restart. The KubeVirt containers are built on the
 local machine and are the pushed to a registry which is exposed at
@@ -9,7 +9,7 @@ local machine and are the pushed to a registry which is exposed at
 ## Bringing the cluster up
 
 ```bash
-export KUBEVIRT_PROVIDER=os-3.10.0-multus
+export KUBEVIRT_PROVIDER=os-3.11.0-multus
 export KUBEVIRT_NUM_NODES=2 # master + one node
 make cluster-up
 ```
@@ -39,7 +39,7 @@ Use the default user `admin:admin` to log in.
 ## Bringing the cluster down
 
 ```bash
-export KUBEVIRT_PROVIDER=os-3.10.0-multus
+export KUBEVIRT_PROVIDER=os-3.11.0-multus
 make cluster-down
 ```
 

cluster/os-3.11.0-multus/provider.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+source cluster/os-3.11.0/provider.sh
+
+image="os-3.11.0-multus@sha256:46155f973cb4637be5f73cf0307bb09e4caf5c66bd921cf5d1988db2598a8995"

stdci.yaml

@@ -6,13 +6,13 @@ sub-stages:
       timeout: 4h
   - k8s-1.11.0-release:
       timeout: 4h
-  - k8s-multus-1.11.1-release
+  - k8s-multus-1.12.2-release
   - k8s-genie-1.11.1-release
   - openshift-3.11-release:
       timeout: 4h
   - openshift-3.11-crio-release:
       timeout: 4h
-  - openshift-3.10-multus-release
+  - openshift-3.11-multus-release
   - windows2016-release
 runtime_requirements:
   support_nesting_level: 2