simplify e2e automation

Get rid of smart PROVIDER parsing and simply keep single shell script
per target.

Since we switched to kubevirtci's cluster-up, switch from OpenShift 3
to OKD 4 as part of this patch.

Signed-off-by: Petr Horacek <[email protected]>

automation/check-patch.e2e-lifecycle-k8s.mounts

@@ -0,0 +1 @@
+check-patch.e2e.mounts

automation/check-patch.e2e-lifecycle-k8s.packages

@@ -0,0 +1 @@
+check-patch.e2e.packages

automation/check-patch.e2e-lifecycle-k8s.sh

@@ -0,0 +1,27 @@
+#!/bin/bash -xe
+
+# This script should be able to execute lifecycle functional tests against
+# Kubernetes cluster on any environment with basic dependencies listed in
+# check-patch.packages installed and docker running.
+#
+# yum -y install automation/check-patch.packages
+# automation/check-patch.e2e-lifecycle-k8s.sh
+
+teardown() {
+    make cluster-down
+}
+
+main() {
+    export KUBEVIRT_PROVIDER='k8s-1.14.6'
+
+    source automation/check-patch.e2e.setup.sh
+    cd ${TMP_PROJECT_PATH}
+
+    make cluster-down
+    make cluster-up
+    trap teardown EXIT SIGINT SIGTERM SIGSTOP
+    make cluster-operator-push
+    make test/e2e/lifecycle
+}
+
+[[ "${BASH_SOURCE[0]}" == "$0" ]] && main "$@"

automation/check-patch.e2e-lifecycle-okd.mounts

@@ -0,0 +1 @@
+check-patch.e2e.mounts

automation/check-patch.e2e-lifecycle-okd.packages

@@ -0,0 +1 @@
+check-patch.e2e.packages

automation/check-patch.e2e-lifecycle-okd.sh

@@ -0,0 +1,27 @@
+#!/bin/bash -xe
+
+# This script should be able to execute functional tests against OKD cluster on
+# any environment with basic dependencies listed in check-patch.packages
+# installed and docker running.
+#
+# yum -y install automation/check-patch.packages
+# automation/check-patch.e2e-lifecycle-okd.sh
+
+teardown() {
+    make cluster-down
+}
+
+main() {
+    export KUBEVIRT_PROVIDER='okd-4.1'
+
+    source automation/check-patch.e2e.setup.sh
+    cd ${TMP_PROJECT_PATH}
+
+    make cluster-down
+    make cluster-up
+    trap teardown EXIT SIGINT SIGTERM SIGSTOP
+    make cluster-operator-push
+    make test/e2e/lifecycle
+}
+
+[[ "${BASH_SOURCE[0]}" == "$0" ]] && main "$@"

automation/check-patch.e2e-workflow-k8s.mounts

@@ -0,0 +1 @@
+check-patch.e2e.mounts

automation/check-patch.e2e-workflow-k8s.packages

@@ -0,0 +1 @@
+check-patch.e2e.packages

automation/check-patch.e2e-workflow-k8s.sh

@@ -0,0 +1,28 @@
+#!/bin/bash -xe
+
+# This script should be able to execute workflow functional tests against
+# Kubernetes cluster on any environment with basic dependencies listed in
+# check-patch.packages installed and docker running.
+#
+# yum -y install automation/check-patch.packages
+# automation/check-patch.e2e-workflow-k8s.sh
+
+teardown() {
+    make cluster-down
+}
+
+main() {
+    export KUBEVIRT_PROVIDER='k8s-1.14.6'
+
+    source automation/check-patch.e2e.setup.sh
+    cd ${TMP_PROJECT_PATH}
+
+    make cluster-down
+    make cluster-up
+    trap teardown EXIT SIGINT SIGTERM SIGSTOP
+    make cluster-operator-push
+    make cluster-operator-install
+    make test/e2e/workflow
+}
+
+[[ "${BASH_SOURCE[0]}" == "$0" ]] && main "$@"

automation/check-patch.e2e-workflow-okd.mounts

@@ -0,0 +1 @@
+check-patch.e2e.mounts

automation/check-patch.e2e-workflow-okd.packages

@@ -0,0 +1 @@
+check-patch.e2e.packages

automation/check-patch.e2e-workflow-okd.sh

@@ -0,0 +1,28 @@
+#!/bin/bash -xe
+
+# This script should be able to execute workflow functional tests against OKD
+# cluster on any environment with basic dependencies listed in
+# check-patch.packages installed and docker running.
+#
+# yum -y install automation/check-patch.packages
+# automation/check-patch.e2e-workflow-okd.sh
+
+teardown() {
+    make cluster-down
+}
+
+main() {
+    export KUBEVIRT_PROVIDER='okd-4.1'
+
+    source automation/check-patch.e2e.setup.sh
+    cd ${TMP_PROJECT_PATH}
+
+    make cluster-down
+    make cluster-up
+    trap teardown EXIT SIGINT SIGTERM SIGSTOP
+    make cluster-operator-push
+    make cluster-operator-install
+    make test/e2e/workflow
+}
+
+[[ "${BASH_SOURCE[0]}" == "$0" ]] && main "$@"

automation/check-patch.e2e.setup.sh

@@ -0,0 +1,27 @@
+# Prepare environment for CNAO end to end testing. This includes temporary Go paths and binaries.
+#
+# source automation/check-patch.e2e.setup.sh
+# cd ${TMP_PROJECT_PATH}
+
+echo 'Setup Go paths'
+export GOROOT=/tmp/cluster-network-addons-operator/go/root
+mkdir -p $GOROOT
+export GOPATH=/tmp/cluster-network-addons-operator/go/path
+mkdir -p $GOPATH
+export PATH=${GOPATH}/bin:${GOROOT}/bin:${PATH}
+
+echo 'Install Go 1.12'
+export GIMME_GO_VERSION=1.12
+GIMME=/tmp/cluster-network-addons-operator/go/gimme
+mkdir -p $GIMME
+curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | HOME=${GIMME} bash >> ${GIMME}/gimme.sh
+source ${GIMME}/gimme.sh
+
+echo 'Install operator repository under the temporary Go path'
+TMP_PROJECT_PATH=${GOPATH}/src/github.com/kubevirt/cluster-network-addons-operator
+rm -rf ${TMP_PROJECT_PATH}
+mkdir -p ${TMP_PROJECT_PATH}
+cp -rf $(pwd)/* ${TMP_PROJECT_PATH}
+
+echo 'Exporting temporary project path'
+export TMP_PROJECT_PATH

cluster/operator-push.sh

@@ -17,7 +17,11 @@
 set -ex
 
 registry_port=$(./cluster/cli.sh ports registry | tr -d '\r')
-registry=localhost:$registry_port
+if [[ "${KUBEVIRT_PROVIDER}" =~ ^okd-.*$ ]]; then \
+		registry=localhost:$(./cluster/cli.sh ports --container-name=cluster registry | tr -d '\r')
+else
+    registry=localhost:$(./cluster/cli.sh ports registry | tr -d '\r')
+fi
 
 # Cleanup previously generated manifests
 rm -rf _out/
@@ -29,12 +33,5 @@ make cluster-clean
 
 IMAGE_REGISTRY=$registry make docker-build-operator docker-push-operator
 
-for i in $(seq 1 ${CLUSTER_NUM_NODES}); do
-    ./cluster/cli.sh ssh "node$(printf "%02d" ${i})" 'sudo docker pull registry:5000/cluster-network-addons-operator'
-    # Temporary until image is updated with provisioner that sets this field
-    # This field is required by buildah tool
-    ./cluster/cli.sh ssh "node$(printf "%02d" ${i})" 'sudo sysctl -w user.max_user_namespaces=1024'
-done
-
 ./cluster/kubectl.sh create -f _out/cluster-network-addons/${VERSION}/namespace.yaml
 ./cluster/kubectl.sh create -f _out/cluster-network-addons/${VERSION}/network-addons-config.crd.yaml

stdci.yaml

@@ -1,8 +1,8 @@
 sub-stages:
-  - lifecycle.k8s-1.13.3
-  - lifecycle.os-3.11.0
-  - workflow.k8s-1.13.3
-  - workflow.os-3.11.0
+  - e2e-lifecycle-k8s
+  - e2e-lifecycle-okd
+  - e2e-workflow-k8s
+  - e2e-workflow-okd
 
 runtime_requirements:
   support_nesting_level: 2

test/check/check.go

@@ -25,6 +25,8 @@ import (
 	opv1alpha1 "github.com/kubevirt/cluster-network-addons-operator/pkg/apis/networkaddonsoperator/v1alpha1"
 	"github.com/kubevirt/cluster-network-addons-operator/pkg/components"
 	"github.com/kubevirt/cluster-network-addons-operator/pkg/names"
+
+	. "github.com/kubevirt/cluster-network-addons-operator/test/okd"
 )
 
 const (
@@ -35,6 +37,11 @@ const (
 
 func CheckComponentsDeployment(components []Component) {
 	for _, component := range components {
+		if component.ComponentName == MultusComponent.ComponentName && IsOnOKDCluster() {
+			// On OpenShift 4, Multus is not owned by us
+			continue
+		}
+
 		By(fmt.Sprintf("Checking that component %s is deployed", component.ComponentName))
 		err := checkForComponent(&component)
 		Expect(err).NotTo(HaveOccurred(), "Component has not been fully deployed")
@@ -43,6 +50,11 @@ func CheckComponentsDeployment(components []Component) {
 
 func CheckComponentsRemoval(components []Component) {
 	for _, component := range components {
+		if component.ComponentName == MultusComponent.ComponentName && IsOnOKDCluster() {
+			// On OpenShift 4, Multus is not owned by us
+			continue
+		}
+
 		// TODO: Once finalizers are implemented, we should switch to using
 		// once-time checks, since after NodeNetworkState removal, no components
 		// should be left over.

test/check/components.go

@@ -40,7 +40,6 @@ var (
 		SecurityContextConstraints: "nmstate",
 		DaemonSets:                 []string{"nmstate-handler"},
 	}
-
 	OvsComponent = Component{
 		ComponentName:              "Ovs",
 		ClusterRole:                "ovs-cni-marker-cr",

test/e2e/workflow/deployment_test.go

@@ -9,6 +9,7 @@ import (
 
 	opv1alpha1 "github.com/kubevirt/cluster-network-addons-operator/pkg/apis/networkaddonsoperator/v1alpha1"
 	. "github.com/kubevirt/cluster-network-addons-operator/test/check"
+	. "github.com/kubevirt/cluster-network-addons-operator/test/okd"
 	. "github.com/kubevirt/cluster-network-addons-operator/test/operations"
 )
 
@@ -190,7 +191,16 @@ func testConfigUpdate(configSpec opv1alpha1.NetworkAddonsConfigSpec, components
 }
 
 func checkConfigChange(components []Component) {
-	if len(components) > 0 {
+	// On OpenShift 4, Multus is already deployed by default
+	onlyMultusOnOKDCluster := (len(components) == 1 &&
+		IsOnOKDCluster() &&
+		components[0].ComponentName == MultusComponent.ComponentName)
+	noComponentToDeploy := len(components) == 0 || onlyMultusOnOKDCluster
+	if noComponentToDeploy {
+		// Wait until Available condition is reported. Should be fast when no components are
+		// being deployed
+		CheckConfigCondition(ConditionAvailable, ConditionTrue, 5*time.Minute, CheckDoNotRepeat)
+	} else {
 		// If there are any components to deploy wait until Progressing condition is reported
 		CheckConfigCondition(ConditionProgressing, ConditionTrue, time.Minute, CheckDoNotRepeat)
 
@@ -201,9 +211,5 @@ func checkConfigChange(components []Component) {
 
 		// Check that all requested components have been deployed
 		CheckComponentsDeployment(components)
-	} else {
-		// Wait until Available condition is reported. Should be fast when no components are
-		// being deployed
-		CheckConfigCondition(ConditionAvailable, ConditionTrue, 5*time.Minute, CheckDoNotRepeat)
 	}
 }

test/okd/okd.go

@@ -0,0 +1,10 @@
+package okd
+
+import (
+	"os"
+	"strings"
+)
+
+func IsOnOKDCluster() bool {
+	return strings.HasPrefix(os.Getenv("KUBEVIRT_PROVIDER"), "okd-")
+}