diff --git a/automation/check-patch.k8s-1.11.0-release.mounts b/automation/check-patch.k8s-1.13.3-release.mounts similarity index 100% rename from automation/check-patch.k8s-1.11.0-release.mounts rename to automation/check-patch.k8s-1.13.3-release.mounts diff --git a/automation/check-patch.k8s-1.11.0-release.packages b/automation/check-patch.k8s-1.13.3-release.packages similarity index 100% rename from automation/check-patch.k8s-1.11.0-release.packages rename to automation/check-patch.k8s-1.13.3-release.packages diff --git a/automation/check-patch.k8s-1.11.0-release.sh b/automation/check-patch.k8s-1.13.3-release.sh similarity index 100% rename from automation/check-patch.k8s-1.11.0-release.sh rename to automation/check-patch.k8s-1.13.3-release.sh diff --git a/automation/test.sh b/automation/test.sh index c97c37c20..bdd4a58d1 100755 --- a/automation/test.sh +++ b/automation/test.sh @@ -32,7 +32,7 @@ mkdir -p "${WORKSPACE}/${ARTIFACTS_PATH}" if [[ $TARGET =~ openshift-.* ]]; then export KUBEVIRT_PROVIDER="os-3.11.0" elif [[ $TARGET =~ k8s-.* ]]; then - export KUBEVIRT_PROVIDER="k8s-1.11.0" + export KUBEVIRT_PROVIDER="k8s-1.13.3" fi export KUBEVIRT_NUM_NODES=2 diff --git a/cluster/gocli.sh b/cluster/gocli.sh index 9c375b8f5..fc9e9df50 100755 --- a/cluster/gocli.sh +++ b/cluster/gocli.sh @@ -1,3 +1,3 @@ -gocli_image="kubevirtci/gocli@sha256:2ff1e9cddfa2cfdf268301a52d1a5ec252ace6908196609e001844e5458b746a" +gocli_image="kubevirtci/gocli@sha256:fa7f615a1b07925b27027c57bf09bba0e9874ca92e4f67559556950665598c49" gocli="docker run --net=host --privileged --rm -v /var/run/docker.sock:/var/run/docker.sock $gocli_image" gocli_interactive="docker run --net=host --privileged --rm -it -v /var/run/docker.sock:/var/run/docker.sock $gocli_image" diff --git a/cluster/up.sh b/cluster/up.sh index ed23e828c..92f6fa87a 100755 --- a/cluster/up.sh +++ b/cluster/up.sh @@ -14,7 +14,7 @@ fi image=$(getClusterType) echo "Image:${image}" if [[ $image == $KUBERNETES_IMAGE ]]; then - $gocli run --random-ports --nodes ${num_nodes} --memory ${mem_size} --background kubevirtci/${image} + $gocli run --enable-ceph --random-ports --nodes ${num_nodes} --memory ${mem_size} --background kubevirtci/${image} cluster_port=$($gocli ports k8s | tr -d '\r') $gocli scp /usr/bin/kubectl - > ./cluster/.kubectl chmod u+x ./cluster/.kubectl diff --git a/hack/README.md b/hack/README.md index ed66e9a47..14e32efae 100644 --- a/hack/README.md +++ b/hack/README.md @@ -50,7 +50,7 @@ The standard workflow is performed inside a helper container to normalize the bu - `docker-functest-registry-populate`: build the container that popuplates registry server with various container images - `docker-functest-registry`: build the container that hosts docker registry - `clean`: cleans up previous build artifacts -- `cluster-up`: start a default Kubernetes or Open Shift cluster. set KUBEVIRT_PROVIDER environment variable to either 'k8s-1.11.0' or 'os-3.11.0' to select the type of cluster. set KUBEVIRT_NUM_NODES to something higher than 1 to have more than one node. +- `cluster-up`: start a default Kubernetes or Open Shift cluster. set KUBEVIRT_PROVIDER environment variable to either 'k8s-1.13.3' or 'os-3.11.0' to select the type of cluster. set KUBEVIRT_NUM_NODES to something higher than 1 to have more than one node. - `cluster-down`: stop the cluster, doing a make cluster-down && make cluster-up will basically restart the cluster into an empty fresh state. - `cluster-down-purge`: cluster-down and cleanup all cached images from docker registry. Accepts [make variables](#make-variables) DOCKER_REPO. Removes all images of the specified repository. If not specified removes localhost repository of current cluster instance. - `cluster-sync`: builds the controller/importer/cloner, and pushes it into a running cluster. The cluster must be up before running a cluster sync. Also generates a manifest and applies it to the running cluster after pushing the images to it. @@ -131,7 +131,7 @@ Environment Variables and Supported Values | Env Variable | Default | Additional Values | |--------------------|---------------|--------------------| -|KUBEVIRT_PROVIDER | k8s-1.11.0 | os-3.11.0 | +|KUBEVIRT_PROVIDER | k8s-1.13.3 | os-3.11.0 | |NUM_NODES | 1 | 2-5 | To Run Standard *cluster-up/kubevirtci* Tests diff --git a/hack/build/config.sh b/hack/build/config.sh index e68b4598e..89b5be1ca 100755 --- a/hack/build/config.sh +++ b/hack/build/config.sh @@ -49,11 +49,11 @@ VERBOSITY=${VERBOSITY:-1} PULL_POLICY=${PULL_POLICY:-IfNotPresent} NAMESPACE=${NAMESPACE:-cdi} -KUBERNETES_IMAGE="k8s-1.11.0@sha256:e02ec414c7673a3644b5ba742b550a124c9195eaacb280151406bf9e8201a95f" +KUBERNETES_IMAGE="k8s-1.13.3@sha256:bc0f02d6b970650eb16d12f97e5aa1376b3a13b0ffed6227db98675be2ca1184" OPENSHIFT_IMAGE="os-3.11.0-crio@sha256:3f11a6f437fcdf2d70de4fcc31e0383656f994d0d05f9a83face114ea7254bc0" -KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.11.0} +KUBEVIRT_PROVIDER=${KUBEVIRT_PROVIDER:-k8s-1.13.3} function allPkgs() { ret=$(sed "s,kubevirt.io/containerized-data-importer,${CDI_DIR},g" <(go list ./... | grep -v "pkg/client" | sort -u)) @@ -84,7 +84,7 @@ function parseTestOpts() { function getClusterType() { local image case "${KUBEVIRT_PROVIDER}" in - "k8s-1.11.0") + "k8s-1.13.3") image=$KUBERNETES_IMAGE ;; "os-3.11.0") @@ -97,7 +97,7 @@ function getClusterType() { function getTestPullPolicy() { local pp case "${KUBEVIRT_PROVIDER}" in - "k8s-1.11.0") + "k8s-1.13.3") pp=$PULL_POLICY ;; "os-3.11.0") diff --git a/stdci.yaml b/stdci.yaml index 624d648ed..99e0e9305 100644 --- a/stdci.yaml +++ b/stdci.yaml @@ -1,6 +1,6 @@ --- sub-stages: - - k8s-1.11.0-release + - k8s-1.13.3-release - openshift-3.11.0-release runtime_requirements: support_nesting_level: 2