From 53cff09fcc91242a4e13747ca7acf414b5716c33 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Thu, 2 Jul 2020 15:30:38 -0500
Subject: [PATCH] Make stage names prettier
---
.gitlab-ci.yml | 16 ++++++++--------
helpers/build_image.yml | 4 +++-
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b5fa41..8cf5d95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,10 @@
stages:
- - get_chart
- - deploy_rabbit
- - deploy_grb
- - deploy_g2g
- - deploy_wms
- - deploy_wmts
+ - get chart
+ - deploy rabbit
+ - deploy GRB
+ - deploy G2G
+ - deploy WMS
+ - deploy WMTS
variables:
DOCKER_TLS_CERTDIR: ""
@@ -39,7 +39,7 @@ build ci:
.get_chart_tmpl:
- stage: get_chart
+ stage: get chart
image: $CICHART_IMAGE
services:
- docker:19.03.1-dind
@@ -92,7 +92,7 @@ get_chart_grb:
# TODO: Use "environment: " to define a job for production and one for development
# https://docs.gitlab.com/ee/ci/yaml/#environment
deploy_grb:
- stage: deploy_grb
+ stage: deploy GRB
image: $CICHART_IMAGE
services:
- docker:19.03.1-dind
diff --git a/helpers/build_image.yml b/helpers/build_image.yml
index 5bd92d2..3485f1e 100644
--- a/helpers/build_image.yml
+++ b/helpers/build_image.yml
@@ -15,9 +15,11 @@
variables:
IMAGE_NAME: ""
IMAGE_DIR: ""
- stage: build_image
+ stage: build image
tags:
- docker
+ before_script:
+ - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
script:
- image_url="${CI_REGISTRY_IMAGE}/${IMAGE_NAME}"
- if [ -z "$CI_COMMIT_TAG" ]; then
--
GitLab