From fc10b087e6a92a643dc7cc4ee759564b642f0cd3 Mon Sep 17 00:00:00 2001
From: Nicholas Shavers <nshavers@contractor.usgs.gov>
Date: Wed, 20 Nov 2024 10:30:09 -0800
Subject: [PATCH] renamed to GEOMAG_TAG
---
.gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ef8ea9c..c261457f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,16 +15,16 @@ variables:
BRANCH_OR_TAG: :${CI_COMMIT_REF_SLUG} # format looks like ':feature-branch'
BRANCH_OR_TAG: ${BRANCH_OR_TAG/:master/:latest} #replaces ':master' with ':latest'
DOCKER_AUTH_CONFIG: '{"auths":{"$CI_REGISTRY":{"username":"$CI_REGISTRY_USER","password":"$CI_REGISTRY_PASSWORD"}}}' #Authentication for Docker Executor.
- ENVIRONMENT_TAG: geomag
+ GEOMAG_TAG: geomag
# Do not run in upstream for merge requests
workflow:
rules:
- if: $CI_COMMIT_TAG && $CI_PROJECT_PATH != $UPSTREAM_PATH
variables:
- ENVIRONMENT_TAG: staging01
+ GEOMAG_TAG: staging01
- if: $CI_COMMIT_BRANCH && $CI_PROJECT_PATH != $UPSTREAM_PATH
variables:
- ENVIRONMENT_TAG: staging01
+ GEOMAG_TAG: staging01
- if: $CI_COMMIT_TAG || $CI_COMMIT_BRANCH
## --------------------------------------------------
@@ -182,7 +182,7 @@ Test:
tags:
- deploy
- swarm
- - $ENVIRONMENT_TAG #ensures we use geomag-specific- deploy, swarm tagged runners
+ - $GEOMAG_TAG #ensures we use geomag-specific- deploy, swarm tagged runners
## --------------------------------------------------
# Integration Stage
@@ -223,7 +223,7 @@ Build Docker Image:
tags:
# TODO: refactor to separate build/publish steps
- deploy
- - $ENVIRONMENT_TAG #ensures we use geomag-specific- deploy, swarm tagged runners
+ - $GEOMAG_TAG #ensures we use geomag-specific- deploy, swarm tagged runners
variables:
APP_NAME: geomag-algorithms
FROM_IMAGE: code.usgs.gov:5001/devops/images/usgs/python:3.10-obspy
--
GitLab