From bf22847b8960a02be0d3781658d0639aa16176df Mon Sep 17 00:00:00 2001
From: bclayton-usgs <bclayton@usgs.gov>
Date: Fri, 30 Oct 2020 11:27:11 -0600
Subject: [PATCH] update
---
.gitlab-ci.yml | 11 +++++------
Dockerfile | 1 -
gradle/repositories.gradle | 2 --
ws.Dockerfile | 1 +
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b3661bb9..a8945c3d9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,6 @@ include:
stages:
- build
- - publish
- deploy
####
@@ -92,8 +91,8 @@ Build Lambda:
extends:
- .gradle
script:
- - ./gradlew --no-daemon assemble
- - ./gradlew --no-daemon libs
+ - ./gradlew assemble
+ - ./gradlew libs
artifacts:
expire_in: 1 yr
paths:
@@ -105,7 +104,7 @@ Unit Tests:
- .gradle
coverage: '/Total.*?([0-9]{1,3})%/'
script:
- - ./gradlew --no-daemon check
+ - ./gradlew check
- cat ${JACOCO_HTML_DIR}/index.html
artifacts:
paths:
@@ -140,14 +139,14 @@ Build WS Image:
Maven:
extends:
.gradle
- stage: publish
+ stage: deploy
only:
- tags@ghsc/nshmp/nshmp-ws
script:
- ./gradlew publish -P version=${CI_COMMIT_TAG}
Trigger nshmp-deploy:
- stage: publish
+ stage: deploy
only:
- master@ghsc/nshmp/nshmp-haz-v2
- tags@ghsc/nshmp/nshmp-haz-v2
diff --git a/Dockerfile b/Dockerfile
index 9289bafed..8fe300315 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -45,7 +45,6 @@ WORKDIR ${builder_workdir}
COPY . .
-RUN env
RUN ./gradlew assemble
####
diff --git a/gradle/repositories.gradle b/gradle/repositories.gradle
index 9e74b09fc..af7a2e257 100644
--- a/gradle/repositories.gradle
+++ b/gradle/repositories.gradle
@@ -31,13 +31,11 @@ repositories {
url "https://code.usgs.gov/api/v4/groups/160/-/packages/maven"
name "GitLab"
if (System.getenv("CI_JOB_TOKEN") != "null") {
- print "CI_JOB_TOKEN: " + System.getenv("CI_JOB_TOKEN")
credentials(HttpHeaderCredentials) {
name = "Job-Token"
value = System.getenv("CI_JOB_TOKEN")
}
} else {
- print "GITLAB_TOKEN: " + System.getenv("GITLAB_TOKEN")
credentials(HttpHeaderCredentials) {
name = "Private-Token"
value = System.getenv("GITLAB_TOKEN")
diff --git a/ws.Dockerfile b/ws.Dockerfile
index 077561782..4d9afdad5 100644
--- a/ws.Dockerfile
+++ b/ws.Dockerfile
@@ -37,6 +37,7 @@ ENV CI_JOB_TOKEN ${ci_job_token}
WORKDIR ${builder_workdir}
COPY . .
+
RUN ./gradlew assemble
####
--
GitLab