From 776dca1ca7dba28440b0b6dec65130605b7417f3 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Tue, 10 Nov 2020 09:38:43 -0600
Subject: [PATCH] Try to be smarter about using KUBECONFIG
---
ci_tests/gitlab-ci.yaml | 15 ++++++---------
helpers/get_namespace.sh | 1 +
helpers/helm_base.yaml | 2 ++
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ci_tests/gitlab-ci.yaml b/ci_tests/gitlab-ci.yaml
index 92c1154..0f6ec1c 100644
--- a/ci_tests/gitlab-ci.yaml
+++ b/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:
diff --git a/helpers/get_namespace.sh b/helpers/get_namespace.sh
index c985814..e0bb44d 100755
--- a/helpers/get_namespace.sh
+++ b/helpers/get_namespace.sh
@@ -36,4 +36,5 @@ if [[ -z $ns ]]; then
exit 1
fi
+debug "Namespace is \"$ns\""
echo $ns
diff --git a/helpers/helm_base.yaml b/helpers/helm_base.yaml
index e4a5578..73219b2 100644
--- a/helpers/helm_base.yaml
+++ b/helpers/helm_base.yaml
@@ -1,6 +1,8 @@
.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}
--
GitLab