Enable go module support for go environment (#1152)

test/build_and_test.sh

@@ -37,14 +37,15 @@ build_and_push_fetcher $FETCHER_IMAGE:$TAG
 
 build_and_push_builder $BUILDER_IMAGE:$TAG
 
-build_and_push_env_runtime python $REPO/python-env:$TAG
-build_and_push_env_runtime jvm $REPO/jvm-env:$TAG
-build_and_push_env_runtime go $REPO/go-env:$TAG
-build_and_push_env_runtime tensorflow-serving $REPO/tensorflow-serving-env:$TAG
 
-build_and_push_env_builder python $REPO/python-env-builder:$TAG $BUILDER_IMAGE:$TAG
-build_and_push_env_builder jvm $REPO/jvm-env-builder:$TAG $BUILDER_IMAGE:$TAG
-build_and_push_env_builder go $REPO/go-env-builder:$TAG $BUILDER_IMAGE:$TAG
+build_and_push_env_runtime python $REPO/python-env:$TAG ""
+build_and_push_env_runtime jvm $REPO/jvm-env:$TAG ""
+build_and_push_env_runtime go $REPO/go-env:$TAG "1.12"
+build_and_push_env_runtime tensorflow-serving $REPO/tensorflow-serving-env:$TAG ""
+
+build_and_push_env_builder python $REPO/python-env-builder:$TAG $BUILDER_IMAGE:$TAG ""
+build_and_push_env_builder jvm $REPO/jvm-env-builder:$TAG $BUILDER_IMAGE:$TAG ""
+build_and_push_env_builder go $REPO/go-env-builder:$TAG $BUILDER_IMAGE:$TAG "1.12"
 
 build_fission_cli
 

test/test_utils.sh

@@ -105,10 +105,18 @@ build_and_push_builder() {
 build_and_push_env_runtime() {
     env=$1
     image_tag=$2
+    variant=$3
+
     travis_fold_start build_and_push_env_runtime.$env $image_tag
 
+    dockerfile="Dockerfile"
+
+    if [ ! -z ${variant} ]; then
+        dockerfile=${dockerfile}-${variant}
+    fi
+
     pushd $ROOT/environments/$env/
-    docker build -q -t $image_tag .
+    docker build -q -t $image_tag . -f ${dockerfile}
 
     gcloud_login
 
@@ -121,15 +129,23 @@ build_and_push_env_builder() {
     env=$1
     image_tag=$2
     builder_image=$3
+    variant=$4
+
     travis_fold_start build_and_push_env_builder.$env $image_tag
 
-    pushd $ROOT/environments/$env/builder
+    dockerfile="Dockerfile"
 
-    docker build -q -t $image_tag --build-arg BUILDER_IMAGE=${builder_image} .
+    if [ ! -z ${variant} ]; then
+        dockerfile=${dockerfile}-${variant}
+    fi
+
+    pushd ${ROOT}/environments/${env}/builder
+
+    docker build -q -t ${image_tag} --build-arg BUILDER_IMAGE=${builder_image} . -f ${dockerfile}
 
     gcloud_login
 
-    gcloud docker -- push $image_tag
+    gcloud docker -- push ${image_tag}
     popd
     travis_fold_end build_and_push_env_builder.$env
 }

test/tests/test_environments/test_go_env.sh

@@ -55,10 +55,10 @@ timeout 60 bash -c "test_fn $fn_poolmgr 'Hello'"
 log "Testing new deployment function"
 timeout 60 bash -c "test_fn $fn_nd 'Hello'"
 
-# Create zip file without top level directory (vendor-example)
-cd vendor-example && zip -r $tmp_dir/vendor.zip *
+# Create zip file without top level directory (module-example)
+cd module-example && zip -r $tmp_dir/module.zip *
 
-pkgName=$(fission package create --src $tmp_dir/vendor.zip --env $env| cut -f2 -d' '| tr -d \')
+pkgName=$(fission package create --src $tmp_dir/module.zip --env $env| cut -f2 -d' '| tr -d \')
 
 # wait for build to finish at most 90s
 timeout 90 bash -c "waitBuild $pkgName"

test/utils.sh

@@ -143,6 +143,7 @@ export FISSION_ROUTER=${FISSION_ROUTER:-$router}
 export FISSION_NATS_STREAMING_URL="http://defaultFissionAuthToken@$(kubectl -n $FISSION_NAMESPACE get svc nats-streaming -o jsonpath='{...ip}:{.spec.ports[0].port}')"
 
 ## Parameters used by some specific test cases
+## To change the environment image setting for CI test, please refer run_all_tests() in test_utils.sh.
 export PYTHON_RUNTIME_IMAGE=${PYTHON_RUNTIME_IMAGE:-fission/python-env}
 export PYTHON_BUILDER_IMAGE=${PYTHON_BUILDER_IMAGE:-fission/python-builder}
 export GO_RUNTIME_IMAGE=${GO_RUNTIME_IMAGE:-fission/go-env}