diff --git a/ci_tests/gitlab-ci.yaml b/ci_tests/gitlab-ci.yaml index 92c1154354c1c09208baecb8e9a1a4ac101fd95a..0f6ec1c0eb35e390a3e115ad39c522bb0de1e811 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 c9858144323b26897f72bc453c363228a31f1adc..e0bb44d6d44436a510e3c4dfd775410fb241a472 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 e4a5578d2fc61f9c4571edd3211dc79453105bc7..73219b261545d6185bed83acfcd0224df23ed2e3 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}