refactor arg parser; e2e-helm.sh uses buildah or docker

Author: estroz

hack/lib/test_lib.sh

@@ -54,3 +54,21 @@ function parseFlag() {
 function parseArg() {
 	echo "$(echo "$1" | awk '{ print gensub(/=/, " ", 1) }' | cut -d" " -f2)"
 }
+
+function builderFromArgs() {
+	IMAGE_BUILDER="docker"
+	while [[ $# -gt 0 ]]; do
+	  flag="$(parseFlag "$1")"
+	  arg="$2"
+	  if echo "$1" | grep -qoE -e "--[^ =]*="; then arg="$(parseArg "$1")"; fi
+	  case $flag in
+	    --image-builder)
+	      IMAGE_BUILDER="$arg"
+	      shift
+	      ;;
+	  esac
+	  shift
+	done
+
+	echo "$IMAGE_BUILDER"
+}

hack/tests/e2e-ansible.sh

@@ -3,25 +3,10 @@
 source hack/lib/test_lib.sh
 
 DEST_IMAGE="quay.io/example/memcached-operator:v0.0.2"
-
-IMAGE_BUILDER="docker"
-while [[ $# -gt 0 ]]; do
-  flag="$(parseFlag "$1")"
-  arg="$2"
-  if echo "$1" | grep -qoE -e "--[^ =]*="; then arg="$(parseArg "$1")"; fi
-  case $flag in
-    --image-builder)
-      IMAGE_BUILDER="$arg"
-      shift
-      ;;
-  esac
-  shift
-done
+IMAGE_BUILDER="$(builderFromArgs $@)"
 
 set -ex
 
-echo $IMAGE_BUILDER
-
 # switch to the "default" namespace if on openshift, to match the minikube test
 if which oc 2>/dev/null; then oc project default; fi
 

hack/tests/e2e-helm.sh

@@ -3,6 +3,10 @@
 source hack/lib/test_lib.sh
 
 DEST_IMAGE="quay.io/example/nginx-operator:v0.0.2"
+IMAGE_BUILDER="$(builderFromArgs $@)"
+
+echo "$IMAGE_BUILDER"
+exit
 
 set -ex
 
@@ -18,7 +22,14 @@ fi
 # build operator binary and base image
 GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o test/helm-operator/helm-operator test/helm-operator/cmd/helm-operator/main.go
 pushd test/helm-operator
-docker build -t quay.io/water-hole/helm-operator .
+HELM_OP_IMAGE="quay.io/water-hole/helm-operator:latest"
+# Use buildah by default.
+if [[ "$IMAGE_BUILDER" == "buildah" ]] && command -v buildah; then
+    buildah bud --isolation=rootless --layers=true -t "$HELM_OP_IMAGE" .
+    buildah push "$HELM_OP_IMAGE" docker-daemon:"$HELM_OP_IMAGE"
+else
+    docker build -t "$HELM_OP_IMAGE" .
+fi
 popd
 
 # Make a test directory for Helm tests so we avoid using default GOPATH.
@@ -35,7 +46,10 @@ unset GOPATH GOROOT
 operator-sdk new nginx-operator --api-version=helm.example.com/v1alpha1 --kind=Nginx --type=helm
 pushd nginx-operator
 
-operator-sdk build "$DEST_IMAGE"
+operator-sdk build "$DEST_IMAGE" --image-builder="$IMAGE_BUILDER"
+if [[ "$IMAGE_BUILDER" == "buildah" ]] && command -v buildah; then
+    buildah push "$DEST_IMAGE" docker-daemon:"$DEST_IMAGE"
+fi
 sed -i "s|REPLACE_IMAGE|$DEST_IMAGE|g" deploy/operator.yaml
 sed -i 's|Always|Never|g' deploy/operator.yaml
 sed -i 's|size: 3|replicaCount: 1|g' deploy/crds/helm_v1alpha1_nginx_cr.yaml