diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7399991ce5eb682fc2deb37988f6c92a046fa6f5..f2cabaa71bf3565b42fbe2565bd3e1158c9095bc 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: build/test-results/test/TEST-*.xml REPORTS_DIR: build/reports @@ -137,19 +137,6 @@ default: # Stage: build #### -CHS Registry: - extends: - - .docker-build - variables: - DOCKER_BUILD_ARGS: | - BUILD_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11 - CI_COMMIT_BRANCH=${CI_COMMIT_BRANCH} - CI_PROJECT_URL=${CI_PROJECT_URL} - FROM_IMAGE=${CI_REGISTRY}/devops/images/usgs/java:11 - REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE} - TAG: build - UPSTREAM_PATH: ghsc/nshmp/nshmp-ws - Code Registry: before_script: - docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD}