From d05c2a17fd39c35f8dffbe730b574eb09a616922 Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Fri, 21 Feb 2025 13:13:35 -0700 Subject: [PATCH] remove chs registry --- .gitlab-ci.yml | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8458872c..4d481252 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html JUNIT_FILES: build/test-results/test*/TEST-*.xml - NSHMP_HAZ_WS_IMAGE: ${CODE_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA} + NSHMP_HAZ_WS_IMAGE: ${CI_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA} REPORTS_DIR: build/reports image: ${CI_REGISTRY}/devops/images/usgs/java:11 @@ -135,34 +135,10 @@ default: REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE} TAG: build - #### # Stage: build #### -CHS Registry: - extends: - - .docker-build - parallel: - matrix: - - - CI_PROJECT_NAME: nshmp-haz - DOCKERFILE: Dockerfile - REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE} - TAG: build - - - CI_PROJECT_NAME: nshmp-haz-ws - DOCKERFILE: ws.Dockerfile - REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE} - TAG: 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_PROJECT_URL=${CI_PROJECT_URL} - UPSTREAM_PATH: ghsc/nshmp/nshmp-haz - Container Registry: before_script: - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} -- GitLab