From 09fe0013b42fa891fd9e00ba1ef066f7eece98bd Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Mon, 6 Jul 2020 16:58:55 -0500
Subject: [PATCH] Maybe clean up some CI config
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d19052..64b9751 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
stages:
- get chart
- build prereqs
- - push rabbit
+ - deploy rabbit
- deploy storage
- deploy GRB
- deploy G2G
@@ -92,9 +92,9 @@ get_chart_grb:
SUBCOMP_CHART_DIR: "cspp-geo-grb"
-push_prod_rabbit:
+deploy_prod_rabbit:
extends: .helm_based_job
- stage: push rabbit
+ stage: deploy rabbit
script:
- if [ -n "$CI_COMMIT_TAG" ]; then
ns="geosphere";
@@ -106,7 +106,7 @@ push_prod_rabbit:
- kubeconfig=$(basename $kubekorner_k3s_config)
# install third-party rabbitmq server
- helm repo add bitnami https://charts.bitnami.com/bitnami
- - helm install --namespace $ns geosphere-rabbit bitnami/rabbitmq
+ - helm upgrade -v 2 --install --kubeconfig $kubeconfig --namespace $ns geosphere-rabbit bitnami/rabbitmq
rules:
- if: '$kubekorner_k3s_config == ""'
when: never
--
GitLab