diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ef8ea9c8097510841f304097ee19c007478a360..c261457f766ace7932a8f74694b583ca1f0ca26a 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