From 6027689dd17032f7216244068afabaa65fcb71f4 Mon Sep 17 00:00:00 2001 From: Sebastian Sch Date: Mon, 19 Nov 2018 15:43:35 +0200 Subject: [PATCH] Added Openshift 3.11 and k8s 1.12.2 with multus providers. --- ... => check-patch.k8s-multus-1.12.2-release.mounts} | 0 ...> check-patch.k8s-multus-1.12.2-release.packages} | 0 ...e.sh => check-patch.k8s-multus-1.12.2-release.sh} | 0 ...ch.openshift-3.11-multus-release.environment.yaml | 1 + ...check-patch.openshift-3.11-multus-release.mounts} | 0 ...eck-patch.openshift-3.11-multus-release.packages} | 0 ... => check-patch.openshift-3.11-multus-release.sh} | 0 automation/test.sh | 4 ++-- .../README.md | 12 ++++++------ .../provider.sh | 2 +- cluster/os-3.10.0-multus/provider.sh | 7 ------- .../{os-3.10.0-multus => os-3.11.0-multus}/README.md | 8 ++++---- cluster/os-3.11.0-multus/provider.sh | 7 +++++++ stdci.yaml | 4 ++-- 14 files changed, 23 insertions(+), 22 deletions(-) rename automation/{check-patch.k8s-multus-1.11.1-release.mounts => check-patch.k8s-multus-1.12.2-release.mounts} (100%) rename automation/{check-patch.k8s-multus-1.11.1-release.packages => check-patch.k8s-multus-1.12.2-release.packages} (100%) rename automation/{check-patch.k8s-multus-1.11.1-release.sh => check-patch.k8s-multus-1.12.2-release.sh} (100%) create mode 120000 automation/check-patch.openshift-3.11-multus-release.environment.yaml rename automation/{check-patch.openshift-3.10-multus-release.mounts => check-patch.openshift-3.11-multus-release.mounts} (100%) rename automation/{check-patch.openshift-3.10-multus-release.packages => check-patch.openshift-3.11-multus-release.packages} (100%) rename automation/{check-patch.openshift-3.10-multus-release.sh => check-patch.openshift-3.11-multus-release.sh} (100%) rename cluster/{k8s-multus-1.11.1 => k8s-multus-1.12.2}/README.md (76%) rename cluster/{k8s-multus-1.11.1 => k8s-multus-1.12.2}/provider.sh (90%) delete mode 100644 cluster/os-3.10.0-multus/provider.sh rename cluster/{os-3.10.0-multus => os-3.11.0-multus}/README.md (89%) create mode 100644 cluster/os-3.11.0-multus/provider.sh diff --git a/automation/check-patch.k8s-multus-1.11.1-release.mounts b/automation/check-patch.k8s-multus-1.12.2-release.mounts similarity index 100% rename from automation/check-patch.k8s-multus-1.11.1-release.mounts rename to automation/check-patch.k8s-multus-1.12.2-release.mounts diff --git a/automation/check-patch.k8s-multus-1.11.1-release.packages b/automation/check-patch.k8s-multus-1.12.2-release.packages similarity index 100% rename from automation/check-patch.k8s-multus-1.11.1-release.packages rename to automation/check-patch.k8s-multus-1.12.2-release.packages diff --git a/automation/check-patch.k8s-multus-1.11.1-release.sh b/automation/check-patch.k8s-multus-1.12.2-release.sh similarity index 100% rename from automation/check-patch.k8s-multus-1.11.1-release.sh rename to automation/check-patch.k8s-multus-1.12.2-release.sh diff --git a/automation/check-patch.openshift-3.11-multus-release.environment.yaml b/automation/check-patch.openshift-3.11-multus-release.environment.yaml new file mode 120000 index 000000000000..888daab8a4df --- /dev/null +++ b/automation/check-patch.openshift-3.11-multus-release.environment.yaml @@ -0,0 +1 @@ +check-patch.environment.yaml \ No newline at end of file diff --git a/automation/check-patch.openshift-3.10-multus-release.mounts b/automation/check-patch.openshift-3.11-multus-release.mounts similarity index 100% rename from automation/check-patch.openshift-3.10-multus-release.mounts rename to automation/check-patch.openshift-3.11-multus-release.mounts diff --git a/automation/check-patch.openshift-3.10-multus-release.packages b/automation/check-patch.openshift-3.11-multus-release.packages similarity index 100% rename from automation/check-patch.openshift-3.10-multus-release.packages rename to automation/check-patch.openshift-3.11-multus-release.packages diff --git a/automation/check-patch.openshift-3.10-multus-release.sh b/automation/check-patch.openshift-3.11-multus-release.sh similarity index 100% rename from automation/check-patch.openshift-3.10-multus-release.sh rename to automation/check-patch.openshift-3.11-multus-release.sh diff --git a/automation/test.sh b/automation/test.sh index 62b0a32eb2b6..637887c2d847 100755 --- a/automation/test.sh +++ b/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 diff --git a/cluster/k8s-multus-1.11.1/README.md b/cluster/k8s-multus-1.12.2/README.md similarity index 76% rename from cluster/k8s-multus-1.11.1/README.md rename to cluster/k8s-multus-1.12.2/README.md index af83d9a3dcff..eecb53eaa43f 100644 --- a/cluster/k8s-multus-1.11.1/README.md +++ b/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 5s v1.11.1 +node01 NotReady master 31s v1.12.2 +node02 NotReady 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 ``` diff --git a/cluster/k8s-multus-1.11.1/provider.sh b/cluster/k8s-multus-1.12.2/provider.sh similarity index 90% rename from cluster/k8s-multus-1.11.1/provider.sh rename to cluster/k8s-multus-1.12.2/provider.sh index ae74a4d865cd..a2ec52f7d485 100644 --- a/cluster/k8s-multus-1.11.1/provider.sh +++ b/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 diff --git a/cluster/os-3.10.0-multus/provider.sh b/cluster/os-3.10.0-multus/provider.sh deleted file mode 100644 index 1dab4b0cff5b..000000000000 --- a/cluster/os-3.10.0-multus/provider.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -e - -source cluster/os-3.11.0/provider.sh - -image="os-3.10.0-multus@sha256:875c973099141ab2013aaf51ec2b35b5326be943ef1437e4a87e041405e724ca" diff --git a/cluster/os-3.10.0-multus/README.md b/cluster/os-3.11.0-multus/README.md similarity index 89% rename from cluster/os-3.10.0-multus/README.md rename to cluster/os-3.11.0-multus/README.md index d4561e7c3e5d..59933df4a640 100644 --- a/cluster/os-3.10.0-multus/README.md +++ b/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 ``` diff --git a/cluster/os-3.11.0-multus/provider.sh b/cluster/os-3.11.0-multus/provider.sh new file mode 100644 index 000000000000..7fa24e30e7b0 --- /dev/null +++ b/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" diff --git a/stdci.yaml b/stdci.yaml index d1c954a75fd0..e4dc11044ed1 100644 --- a/stdci.yaml +++ b/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