Allow different namespaces in CI for fission-function and fission-builder (#2609)

* Add variables for function/builder namespace in the test
* Allow different namespaces in integration tests

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
Co-authored-by: Sanket Sudake <sanketsudake@gmail.com>

test/kind_CI.sh

@@ -15,6 +15,7 @@ echo "source test_utils done"
 dump_system_info
 
 export FUNCTION_NAMESPACE=fission-function
+export BUILDER_NAMESPACE=fission-builder
 export FISSION_NAMESPACE=fission
 export FISSION_ROUTER=127.0.0.1:8888
 export NODE_RUNTIME_IMAGE=fission/node-env-14

test/tests/test_annotations.sh

@@ -14,7 +14,7 @@ mkdir -p $tmp_dir
 ENV=python-${TEST_ID}
 RESOURCE_NS=default # Change to test-specific namespace once we support namespaced CRDs
 FUNCTION_NS=${FUNCTION_NAMESPACE:-fission-function}
-BUILDER_NS=fission-builder
+BUILDER_NS=${BUILDER_NAMESPACE:-fission-builder}
 LIST_ANNOTATIONS=go-template='{{range $key,$value := .metadata.annotations}}{{$key}}: {{$value}}{{"\n"}}{{end}}'
 
 # fs

test/tests/test_env_vars.sh

@@ -16,7 +16,7 @@ ENV=python-${TEST_ID}
 FN=foo-${TEST_ID}
 RESOURCE_NS=default # Change to test-specific namespace once we support namespaced CRDs
 FUNCTION_NS=${FUNCTION_NAMESPACE:-fission-function}
-BUILDER_NS=fission-builder
+BUILDER_NS=${BUILDER_NAMESPACE:-fission-builder}
 
 # fs
 ENV_SPEC_FILE=${tmp_dir}/${ENV}.yaml

test/utils.sh

@@ -161,7 +161,7 @@ wait_for_builder() {
     # wait for tiller ready
     set +e
     while true; do
-      kubectl --namespace fission-builder get pod -l envName=$env -o jsonpath="$JSONPATH" | grep "Ready=True"
+      kubectl --namespace $BUILDER_NAMESPACE get pod -l envName=$env -o jsonpath="$JSONPATH" | grep "Ready=True"
       if [[ $? -eq 0 ]]; then
           break
       fi