Skip to content
Snippets Groups Projects
Commit cba720c8 authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

update gitlab ci

parent c9760137
No related branches found
No related tags found
1 merge request!37Maven Registry
...@@ -3,8 +3,7 @@ variables: ...@@ -3,8 +3,7 @@ variables:
CI_REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE} CI_REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
DOCKER_DIR: docker-images DOCKER_DIR: docker-images
DOCKER_TAR: ${DOCKER_DIR}/app.tar DOCKER_TAR: ${DOCKER_DIR}/app.tar
GIT_NSHMP_PASSWORD: ${GITLAB_API_TOKEN} GITLAB_TOKEN: '${CI_JOB_TOKEN}'
GIT_NSHMP_USERNAME: ${GITLAB_USER_EMAIL}
IMAGE_NAME: ${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG} IMAGE_NAME: ${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG}
JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html
JUNIT_FILES: build/test-results/test/TEST-*.xml JUNIT_FILES: build/test-results/test/TEST-*.xml
...@@ -162,13 +161,16 @@ Build Image: ...@@ -162,13 +161,16 @@ Build Image:
script: script:
- | - |
docker build \ docker build \
--build-arg git_username="${GIT_NSHMP_USERNAME}" \ --build-arg gitlab_token="${GITLAB_TOKEN}" \
--build-arg git_password="${GIT_NSHMP_PASSWORD}" \
-t local/${IMAGE_NAME} . -t local/${IMAGE_NAME} .
retry: retry:
max: 2 max: 2
when: 'always' when: 'always'
####
# Stage: publish
####
Build/Publish Data Images: Build/Publish Data Images:
stage: publish stage: publish
image: docker:stable-git image: docker:stable-git
...@@ -190,9 +192,8 @@ Build/Publish Data Images: ...@@ -190,9 +192,8 @@ Build/Publish Data Images:
s3://nshmp-hazard-curves/${data}.nc \ s3://nshmp-hazard-curves/${data}.nc \
DATA/${data}.nc; DATA/${data}.nc;
docker build \ docker build \
--build-arg gitlab_token="${GITLAB_TOKEN}" \
--build-arg netcdf_file="DATA/${data}.nc" \ --build-arg netcdf_file="DATA/${data}.nc" \
--build-arg git_username="${GIT_NSHMP_USERNAME}" \
--build-arg git_password="${GIT_NSHMP_PASSWORD}" \
-t ${INTERNAL_IMAGE_NAME} .; -t ${INTERNAL_IMAGE_NAME} .;
rm DATA/${data}.nc rm DATA/${data}.nc
docker push ${INTERNAL_IMAGE_NAME}; docker push ${INTERNAL_IMAGE_NAME};
...@@ -203,6 +204,15 @@ Build/Publish Data Images: ...@@ -203,6 +204,15 @@ Build/Publish Data Images:
max: 2 max: 2
when: 'always' when: 'always'
Maven:
image: gradle:jdk11
stage: publish
extends: .dev-tags
only:
- tags@ghsc/nshmp/nshmp-netcdf
script:
- ./gradlew publish -P version=${CI_COMMIT_TAG}
#### ####
# Stage: deploy # Stage: deploy
#### ####
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment