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

use defualt image

parent 72c4e10a
No related branches found
No related tags found
2 merge requests!743Production Release | nshmp-haz,!741Docker Images
...@@ -4,6 +4,8 @@ variables: ...@@ -4,6 +4,8 @@ variables:
NSHMP_HAZ_WS_IMAGE: ${CODE_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA} NSHMP_HAZ_WS_IMAGE: ${CODE_REGISTRY_IMAGE}/nshmp-haz-ws:${ENVIRONMENT}-${CI_COMMIT_SHORT_SHA}
REPORTS_DIR: build/reports REPORTS_DIR: build/reports
image: ${CI_REGISTRY}/devops/images/usgs/java:11
# Do not run for merge requests # Do not run for merge requests
workflow: workflow:
rules: rules:
...@@ -150,15 +152,6 @@ default: ...@@ -150,15 +152,6 @@ default:
REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE} REGISTRY_IMAGE: ${CI_REGISTRY_IMAGE}
TAG: build TAG: build
####
# Java Templates
####
##
# General Java setup
##
.java:
image: ${CI_REGISTRY}/devops/images/usgs/java:11
#### ####
# Stage: build # Stage: build
...@@ -214,8 +207,6 @@ Container Registry: ...@@ -214,8 +207,6 @@ Container Registry:
UPSTREAM_PATH: ghsc/nshmp/nshmp-haz UPSTREAM_PATH: ghsc/nshmp/nshmp-haz
Build Project: Build Project:
extends:
- .java
script: script:
- ./gradlew assemble - ./gradlew assemble
stage: build stage: build
...@@ -226,8 +217,6 @@ Build Project: ...@@ -226,8 +217,6 @@ Build Project:
Markdown Lint: Markdown Lint:
allow_failure: true allow_failure: true
extends:
- .java
needs: [] needs: []
script: script:
- ./gradlew nodeInstall - ./gradlew nodeInstall
...@@ -241,8 +230,6 @@ NSHM Tests: ...@@ -241,8 +230,6 @@ NSHM Tests:
reports: reports:
junit: ${JUNIT_FILES} junit: ${JUNIT_FILES}
coverage: '/Total.*?([0-9]{1,3})%/' coverage: '/Total.*?([0-9]{1,3})%/'
extends:
- .java
needs: [] needs: []
parallel: parallel:
matrix: matrix:
...@@ -258,8 +245,6 @@ NSHM Tests: ...@@ -258,8 +245,6 @@ NSHM Tests:
YAML Lint: YAML Lint:
allow_failure: true allow_failure: true
extends:
- .java
needs: [] needs: []
script: script:
- ./gradlew nodeInstall - ./gradlew nodeInstall
...@@ -273,8 +258,6 @@ Unit Tests: ...@@ -273,8 +258,6 @@ Unit Tests:
reports: reports:
junit: ${JUNIT_FILES} junit: ${JUNIT_FILES}
coverage: '/Total.*?([0-9]{1,3})%/' coverage: '/Total.*?([0-9]{1,3})%/'
extends:
- .java
needs: [] needs: []
script: script:
- ./gradlew check - ./gradlew check
......
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