Be more smart with the development and release target detection

yuvalif · Mar 23, 2018 · 9558246 · 9558246
1 parent 0a7e4ee
commit 9558246
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/automation/test.sh b/automation/test.sh
@@ -30,7 +30,7 @@ set -ex
 
 export WORKSPACE="${WORKSPACE:-$PWD}"
 
-if [ "$TARGET" = "openshift-release" ]; then
+if [[ $TARGET =~ openshift-.* ]]; then
   export PROVIDER="os-3.9.0-alpha.4"
 else
   export PROVIDER="k8s-1.9.3"

diff --git a/cluster/deploy.sh b/cluster/deploy.sh
@@ -26,9 +26,9 @@ source hack/config.sh
 echo "Deploying ..."
 
 # Deploy the right manifests for the right target
-if [ -z "$TARGET" ] || [ "$TARGET" = "vagrant-dev" ] || [ "$TARGET" = "kubernetes-dev" ] ; then
+if [[ -z "$TARGET" ]] || [[ TARGET =~ .*-dev ]]; then
     _kubectl create -f ${MANIFESTS_OUT_DIR}/dev -R $i
-elif [ "$TARGET" = "vagrant-release" ] || [ "$TARGET" = "openshift-release" ] || [ "$TARGET" = "kubernetes-release" ] ; then
+elif [[ $TARGET =~ .*-release ]]; then
     for manifest in ${MANIFESTS_OUT_DIR}/release/*; do
         if [[ $manifest =~ .*demo.* ]]; then
             continue
@@ -40,7 +40,7 @@ fi
 # Deploy additional infra for testing
 _kubectl create -f ${MANIFESTS_OUT_DIR}/testing -R $i
 
-if [ "$PROVIDER" = "vagrant-openshift" ] || [ "$PROVIDER" = "os-3.9.0-alpha.4" ] ; then
+if [ "$PROVIDER" = "vagrant-openshift" ] || [ "$PROVIDER" = "os-3.9.0-alpha.4" ]; then
     _kubectl adm policy add-scc-to-user privileged -z kubevirt-controller -n ${namespace}
     _kubectl adm policy add-scc-to-user privileged -z kubevirt-testing -n ${namespace}
     _kubectl adm policy add-scc-to-user privileged -z kubevirt-privileged -n ${namespace}