From 4f56369a698cadf9a9fe16cae69edf16837f60a4 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Tue, 10 Nov 2020 10:36:47 -0600
Subject: [PATCH] Fix helm base image to use gcloud/helm/kubectl image
---
ci_tests/gitlab-ci.yaml | 4 ----
helpers/helm_base.yaml | 5 +++--
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ci_tests/gitlab-ci.yaml b/ci_tests/gitlab-ci.yaml
index 39feb6f..419a18b 100644
--- a/ci_tests/gitlab-ci.yaml
+++ b/ci_tests/gitlab-ci.yaml
@@ -67,11 +67,7 @@
# - if: $DEPLOY_RABBIT
#
test_basic_grb:
-# environment:
-# name: geosphere
-# url: http://geosphere.ssec.wisc.edu
extends: .helm_based_job
- image: gitlab.ssec.wisc.edu:5555/cspp_geo/geosphere/gcloud-kubectl-helm/gcloud-kubectl-helm:6d3e308b
stage: test
script:
- ns=$(./helpers/get_namespace.sh)
diff --git a/helpers/helm_base.yaml b/helpers/helm_base.yaml
index 73219b2..a01134a 100644
--- a/helpers/helm_base.yaml
+++ b/helpers/helm_base.yaml
@@ -1,12 +1,13 @@
.helm_based_job:
extends: .docker_based_job
- image: gitlab.ssec.wisc.edu:5555/cspp_geo/geosphere/geosphere-deploy/cichart:latest
+# image: gitlab.ssec.wisc.edu:5555/cspp_geo/geosphere/geosphere-deploy/cichart:latest
+ image: gitlab.ssec.wisc.edu:5555/cspp_geo/geosphere/gcloud-kubectl-helm/gcloud-kubectl-helm:6d3e308b
variables:
KUBECONFIG: "$KUBECONFIG:$kubekorner_k3s_config"
before_script:
- docker info
- docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
- - source ./helpers/shell_aliases.sh
+# - source ./helpers/shell_aliases.sh
- helm registry login -u ${CI_REGISTRY_USER} -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
- helm repo add stable https://kubernetes-charts.storage.googleapis.com
- helm repo update
--
GitLab