From 75e111fa4c169acaa732c4016ff4ede70cc32a54 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 21 Feb 2025 13:37:26 -0700
Subject: [PATCH 1/2] remove chs registry
---
.gitlab-ci.yml | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7399991..f2cabaa 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}
--
GitLab
From 300f6285eb3cc5c2fce7852fde274677eee813db Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 21 Feb 2025 13:39:18 -0700
Subject: [PATCH 2/2] remove needs
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f2cabaa..b8285e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -186,7 +186,6 @@ YAML Lint:
Trigger AWS Deployment:
needs:
- Build Project
- - CHS Registry
- Code Registry
- Markdown Lint
- Unit Tests
--
GitLab