diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18b3ede2f69802e340267f53698f79c1b86adfeb..f1cd4dd97d00a273bdcf0969cb090265aa26a699 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,8 @@ variables: NSHMP_HAZ_WS_IMAGE: ${CODE_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA} REPORTS_DIR: build/reports +image: ${CI_REGISTRY}/devops/images/usgs/java:11 + # Do not run for merge requests workflow: rules: @@ -150,15 +152,6 @@ default: REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE} TAG: build -#### -# Java Templates -#### - -## -# General Java setup -## -.java: - image: ${CI_REGISTRY}/devops/images/usgs/java:11 #### # Stage: build @@ -214,8 +207,6 @@ Container Registry: UPSTREAM_PATH: ghsc/nshmp/nshmp-haz Build Project: - extends: - - .java script: - ./gradlew assemble stage: build @@ -226,8 +217,6 @@ Build Project: Markdown Lint: allow_failure: true - extends: - - .java needs: [] script: - ./gradlew nodeInstall @@ -241,8 +230,6 @@ NSHM Tests: reports: junit: ${JUNIT_FILES} coverage: '/Total.*?([0-9]{1,3})%/' - extends: - - .java needs: [] parallel: matrix: @@ -258,8 +245,6 @@ NSHM Tests: YAML Lint: allow_failure: true - extends: - - .java needs: [] script: - ./gradlew nodeInstall @@ -273,8 +258,6 @@ Unit Tests: reports: junit: ${JUNIT_FILES} coverage: '/Total.*?([0-9]{1,3})%/' - extends: - - .java needs: [] script: - ./gradlew check