From 8708ec94676d46d9ed1e9dba716dbbfdaf650e2b Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 14 Apr 2022 14:21:55 -0600
Subject: [PATCH] push to upstream
---
.gitlab-ci.yml | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 690beef33..f6321e50c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,9 @@
variables:
JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html
JUNIT_FILES: build/test-results/test/TEST-*.xml
- NSHMP_HAZ_WS_IMAGE: ${CI_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
+ NSHMP_HAZ_WS_IMAGE: ${CI_REGISTRY}/${UPSTREAM_PATH}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
REPORTS_DIR: build/reports
+ UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
# Do not run for merge requests
@@ -100,9 +101,9 @@ default:
for arg in ${DOCKER_BUILD_ARGS}; do
BUILD_ARGS="${BUILD_ARGS} --build-arg ${arg}";
done
- - latest_image_name="${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:latest";
- - env_image_name="${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
- - sha_image_name="${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
+ - latest_image_name="${CI_REGISTRY}/${UPSTREAM_PATH}/${CI_PROJECT_NAME}:latest";
+ - env_image_name="${CI_REGISTRY}/${UPSTREAM_PATH}/${CI_PROJECT_NAME}:${ENVIRONMENT}-latest";
+ - sha_image_name="${CI_REGISTRY}/${UPSTREAM_PATH}/${CI_PROJECT_NAME}:${IMAGE_TAG}";
- |
docker build \
${BUILD_ARGS} \
@@ -153,7 +154,6 @@ Build Image Haz:
BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
CI_JOB_TOKEN=${CI_JOB_TOKEN}
- UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
Build Image WS:
extends:
@@ -165,7 +165,6 @@ Build Image WS:
FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
CI_JOB_TOKEN=${CI_JOB_TOKEN}
DOCKERFILE: ws.Dockerfile
- UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
Build Project:
extends:
@@ -231,4 +230,3 @@ Trigger nshmp-haz-ws CDK:
stage: trigger
variables:
REF: main
- UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
--
GitLab