From cba720c80784493b629605a05e6d7dd970a45214 Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Thu, 10 Sep 2020 08:26:32 -0600
Subject: [PATCH] update gitlab ci
---
.gitlab-ci.yml | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6b6d2c5..0f28564 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,7 @@ variables:
CI_REGISTRY_IMAGE: ${CODE_REGISTRY_IMAGE}
DOCKER_DIR: docker-images
DOCKER_TAR: ${DOCKER_DIR}/app.tar
- GIT_NSHMP_PASSWORD: ${GITLAB_API_TOKEN}
- GIT_NSHMP_USERNAME: ${GITLAB_USER_EMAIL}
+ GITLAB_TOKEN: '${CI_JOB_TOKEN}'
IMAGE_NAME: ${CI_PROJECT_NAME}:${CI_COMMIT_REF_SLUG}
JACOCO_HTML_DIR: ${REPORTS_DIR}/jacoco/test/html
JUNIT_FILES: build/test-results/test/TEST-*.xml
@@ -162,13 +161,16 @@ Build Image:
script:
- |
docker build \
- --build-arg git_username="${GIT_NSHMP_USERNAME}" \
- --build-arg git_password="${GIT_NSHMP_PASSWORD}" \
+ --build-arg gitlab_token="${GITLAB_TOKEN}" \
-t local/${IMAGE_NAME} .
retry:
max: 2
when: 'always'
+####
+# Stage: publish
+####
+
Build/Publish Data Images:
stage: publish
image: docker:stable-git
@@ -190,9 +192,8 @@ Build/Publish Data Images:
s3://nshmp-hazard-curves/${data}.nc \
DATA/${data}.nc;
docker build \
+ --build-arg gitlab_token="${GITLAB_TOKEN}" \
--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} .;
rm DATA/${data}.nc
docker push ${INTERNAL_IMAGE_NAME};
@@ -203,6 +204,15 @@ Build/Publish Data Images:
max: 2
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
####
--
GitLab