From 8318a9ab6162ac56b68a2d96f346e569bb2e8365 Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Fri, 21 Feb 2025 14:06:13 -0700 Subject: [PATCH 1/2] remove chs registry --- .gitlab-ci.yml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbd64d9..69448ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - IMAGE_NAME: ${CODE_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA} + IMAGE_NAME: ${CI_REGISTRY_IMAGE}/${CI_PROJECT_NAME}:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA} JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html JUNIT_FILES: src/lib/build/test-results/test/TEST-*.xml REPORTS_DIR: src/lib/build/reports @@ -142,20 +142,6 @@ default: # Stage: build #### -CHS Registry: - extends: - - .docker-build - variables: - DOCKER_BUILD_ARGS: | - BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11 - FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11 - CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH} - CI_JOB_TOKEN=${CI_JOB_TOKEN} - CI_PROJECT_URL=${CI_PROJECT_URL} - REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE} - TAG: build - UPSTREAM_PATH: ghsc/nshmp/nshmp-ws-static - Code Registry: before_script: - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} @@ -204,7 +190,6 @@ YAML Lint: Trigger AWS Deployment: needs: - - CHS Registry - Code Registry rules: - -- GitLab From 65c51a8d94e8a2acb62d5acf115316e153754d35 Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Fri, 21 Feb 2025 15:00:01 -0700 Subject: [PATCH 2/2] fix path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69448ac..a8728f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,7 +155,7 @@ Code Registry: FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11 REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE} TAG: dev - UPSTREAM_PATH: ghsc/nshmp/nshmp-ws + UPSTREAM_PATH: ghsc/nshmp/nshmp-ws-static Build Project: script: -- GitLab