882 - Fix test scripts

fission · Oct 18, 2018 · eaa3e1a · eaa3e1a
1 parent d517069
commit eaa3e1a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/test/build_and_test.sh b/test/build_and_test.sh
@@ -18,7 +18,7 @@ fi
 source $(dirname $0)/test_utils.sh
 
 REPO=gcr.io/fission-ci
-IMAGE=$REPO/fission-bundle
+IMAGE=fission-bundle
 FETCHER_IMAGE=$REPO/fetcher
 FLUENTD_IMAGE=gcr.io/fission-ci/fluentd
 BUILDER_IMAGE=$REPO/builder
@@ -50,4 +50,4 @@ build_and_push_fluentd $FLUENTD_IMAGE:$TAG
 
 build_fission_cli
 
-install_and_test $IMAGE $TAG $FETCHER_IMAGE $TAG $FLUENTD_IMAGE $TAG $PRUNE_INTERVAL $ROUTER_SERVICE_TYPE $SERVICE_TYPE $PRE_UPGRADE_CHECK_IMAGE
+install_and_test $REPO $IMAGE $TAG $FETCHER_IMAGE $TAG $FLUENTD_IMAGE $TAG $PRUNE_INTERVAL $ROUTER_SERVICE_TYPE $SERVICE_TYPE $PRE_UPGRADE_CHECK_IMAGE
diff --git a/test/test_utils.sh b/test/test_utils.sh
@@ -176,23 +176,24 @@ generate_test_id() {
 
 helm_install_fission() {
     id=$1
-    image=$2
-    imageTag=$3
-    fetcherImage=$4
-    fetcherImageTag=$5
-    controllerNodeport=$6
-    routerNodeport=$7
-    fluentdImage=$8
-    fluentdImageTag=${9}
-    pruneInterval="${10}"
-    routerServiceType=${11}
-    serviceType=${12}
-    preUpgradeCheckImage=${13}
+    repo=$2
+    image=$3
+    imageTag=$4
+    fetcherImage=$5
+    fetcherImageTag=$6
+    controllerNodeport=$7
+    routerNodeport=$8
+    fluentdImage=$9
+    fluentdImageTag=${10}
+    pruneInterval="${11}"
+    routerServiceType=${12}
+    serviceType=${13}
+    preUpgradeCheckImage=${14}
 
     ns=f-$id
     fns=f-func-$id
 
-    helmVars=image=$image,imageTag=$imageTag,fetcherImage=$fetcherImage,fetcherImageTag=$fetcherImageTag,functionNamespace=$fns,controllerPort=$controllerNodeport,routerPort=$routerNodeport,pullPolicy=Always,analytics=false,logger.fluentdImage=$fluentdImage,logger.fluentdImageTag=$fluentdImageTag,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType,serviceType=$serviceType,preUpgradeChecksImage=$preUpgradeCheckImage,prometheus.server.persistentVolume.enabled=false,prometheus.alertmanager.enabled=false,prometheus.kubeStateMetrics.enabled=false,prometheus.nodeExporter.enabled=false
+    helmVars=repository=$repo,image=$image,imageTag=$imageTag,fetcherImage=$fetcherImage,fetcherImageTag=$fetcherImageTag,functionNamespace=$fns,controllerPort=$controllerNodeport,routerPort=$routerNodeport,pullPolicy=Always,analytics=false,logger.fluentdImage=$fluentdImage,logger.fluentdImageTag=$fluentdImageTag,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType,serviceType=$serviceType,preUpgradeChecksImage=$preUpgradeCheckImage,prometheus.server.persistentVolume.enabled=false,prometheus.alertmanager.enabled=false,prometheus.kubeStateMetrics.enabled=false,prometheus.nodeExporter.enabled=false
 
     timeout 30 bash -c "helm_setup"
 
@@ -489,16 +490,17 @@ run_test() {
 }
 
 install_and_test() {
-    image=$1
-    imageTag=$2
-    fetcherImage=$3
-    fetcherImageTag=$4
-    fluentdImage=$5
-    fluentdImageTag=$6
-    pruneInterval=$7
+    repo=$1
+    image=$2
+    imageTag=$3
+    fetcherImage=$4
+    fetcherImageTag=$5
+    fluentdImage=$6
+    fluentdImageTag=$7
+    pruneInterval=$8
     routerServiceType=$8
-    serviceType=$9
-    preUpgradeCheckImage=${10}
+    serviceType=${10}
+    preUpgradeCheckImage=${11}
 
 
     controllerPort=31234
@@ -508,7 +510,7 @@ install_and_test() {
 
     id=$(generate_test_id)
     trap "helm_uninstall_fission $id" EXIT
-    helm_install_fission $id $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage $fluentdImageTag $pruneInterval $routerServiceType $serviceType $preUpgradeCheckImage
+    helm_install_fission $id $repo $image $imageTag $fetcherImage $fetcherImageTag $controllerPort $routerPort $fluentdImage $fluentdImageTag $pruneInterval $routerServiceType $serviceType $preUpgradeCheckImage
     helm status $id | grep STATUS | grep -i deployed
     if [ $? -ne 0 ]; then
         describe_all_pods $id

diff --git a/test/upgrade/fission_upgrade_test.sh b/test/upgrade/fission_upgrade_test.sh
@@ -73,7 +73,7 @@ upgrade_tests
 ## Build images for Upgrade
 
 REPO=gcr.io/fission-ci
-IMAGE=$REPO/fission-bundle
+IMAGE=fission-bundle
 FETCHER_IMAGE=$REPO/fetcher
 FLUENTD_IMAGE=gcr.io/fission-ci/fluentd
 BUILDER_IMAGE=$REPO/builder
@@ -93,7 +93,7 @@ sudo mv $ROOT/fission/fission /usr/local/bin/
 
 ## Upgrade 
 
-helmVars=image=$IMAGE,imageTag=$TAG,fetcherImage=$FETCHER_IMAGE,fetcherImageTag=$TAG,logger.fluentdImage=$FLUENTD_IMAGE,logger.fluentdImageTag=$TAG,functionNamespace=$fns,controllerPort=$controllerNodeport,pullPolicy=Always,analytics=false,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType
+helmVars=repository=$repo,image=$IMAGE,imageTag=$TAG,fetcherImage=$FETCHER_IMAGE,fetcherImageTag=$TAG,logger.fluentdImage=$FLUENTD_IMAGE,logger.fluentdImageTag=$TAG,functionNamespace=$fns,controllerPort=$controllerNodeport,pullPolicy=Always,analytics=false,pruneInterval=$pruneInterval,routerServiceType=$routerServiceType
 
 echo "Upgrading fission"
 helm upgrade	\