From f9462df062843a2b91a0a44927dea267f818e0e9 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 21 Dec 2021 13:02:53 -0700
Subject: [PATCH] Remove hard coded url
---
.gitlab-ci.yml | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee22930..ca77c43 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,8 @@
variables:
- DATA_CONUS_2018A: conus-2018a
- DATA_URL: ${S3_BUCKET}/nshmp_2018a_v1.1-CONUS-hazards-with-preliminary-PGV-fv0.3-1x1.nc
IMAGE_NAME: ${CODE_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
- # # TODO: Remove hard coded url
- # S3_BUCKET: https://nshmp-netcdf-lp-development-rbucket-1of3d1x45yfd9.s3-us-west-2.amazonaws.com
stages:
- build
@@ -149,19 +145,14 @@ workflow:
# Stage: build
####
-Build Image 2018:
- # before_script:
- # - apk add curl
- # - mkdir DATA
- # - curl -SL ${DATA_URL} -o DATA/data.nc
+Build Image:
extends:
- .docker-build
variables:
DOCKER_BUILD_ARGS: |
- BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
- FROM_IMAGE=${DEVOPS_REGISTRY}usgs/java:11
+ BUILD_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
+ FROM_IMAGE=${DEVOPS_REGISTRY}usgs/amazoncorretto:11
ci_job_token=${CI_JOB_TOKEN}
- netcdf_file=DATA/data.nc
UPSTREAM_PATH: ghsc/nshmp/nshmp-ws-static
Build Project:
@@ -201,7 +192,7 @@ YAML Lint:
Trigger AWS Deployment:
needs:
- - Build Image 2018
+ - Build Image
rules:
-
<<: *development-env
--
GitLab