Try to be smarter about using KUBECONFIG

ci_tests/gitlab-ci.yaml

@@ -74,17 +74,14 @@ test_basic_grb:
   stage: test
   script:
     - ns=$(./helpers/get_namespace.sh)
-    - echo $ns
-#    - cd geosphere-grb/chart
-#    - source cspp-geo-grb/cibuild.env
-    # copy secret kubeconfig to the mounted (pwd) directory
-#    - cp $kubekorner_k3s_config .
-#    - kubeconfig=$(basename $kubekorner_k3s_config)
-#    - echo "Deploying version $docker_tag to cluster namespace $ns"
+    - cd geosphere-grb/chart
+    - source cspp-geo-grb/cibuild.env
+    - echo "Deploying version $docker_tag to cluster namespace $ns"
     # copy extra values files to the local directory (where helm has access via docker mount)
-#    - cp ../../ci_geosphere/values-grb-g16.yaml .
+    - cp ../../ci_geosphere/values-grb-g16.yaml .
     # namespace names are the same as domain names
-#    - helm upgrade -v 2 --install --kubeconfig $kubeconfig --namespace $ns --set persistence.enabled=true --set persistence.storageClass=longhorn -f values-grb-g16.yaml cspp-geo-grb cspp-geo-grb/
+    - kubectl get all --namespace $ns
+#    - helm upgrade -v 2 --install --namespace $ns --set persistence.enabled=true --set persistence.storageClass=longhorn -f values-grb-g16.yaml cspp-geo-grb cspp-geo-grb/
   dependencies:
     - get_chart_grb
   rules:

helpers/get_namespace.sh

@@ -36,4 +36,5 @@ if [[ -z $ns ]]; then
     exit 1
 fi
 
+debug "Namespace is \"$ns\""
 echo $ns

helpers/helm_base.yaml

 .helm_based_job:
   extends: .docker_based_job
   image: gitlab.ssec.wisc.edu:5555/cspp_geo/geosphere/geosphere-deploy/cichart:latest
+  variables:
+    KUBECONFIG: "$KUBECONFIG:$kubekorner_k3s_config"
   before_script:
     - docker info
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}