From c673ca763144630508fd0c87d983e9353803ff7c Mon Sep 17 00:00:00 2001
From: Raul Barreras <rbarreras@nebraska.edu>
Date: Fri, 20 Sep 2019 16:39:40 +0000
Subject: [PATCH] Update .gitlab/ci/test.dependency_check.yml
---
.gitlab/ci/test.dependency_check.yml | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/.gitlab/ci/test.dependency_check.yml b/.gitlab/ci/test.dependency_check.yml
index 1e664fc..95be059 100644
--- a/.gitlab/ci/test.dependency_check.yml
+++ b/.gitlab/ci/test.dependency_check.yml
@@ -1,5 +1,10 @@
-test:dependency_check:npm_install:
- stage: test
+stages:
+ - test_dependency_check_npm_install
+ - test_dependency_check_sonar_scanner
+ - test_dependency_check_dependency_check
+
+test_dependency_check_npm_install:
+ stage: test_dependency_check_npm_install
tags:
- docker
image: node:alpine
@@ -10,9 +15,8 @@ test:dependency_check:npm_install:
- cd t/dependency-check/simple-app/
- npm install
-test:dependency_check:sonar-scanner:
- stage: test
- needs: ["test:dependency_check:npm_install"]
+test_dependency_check_sonar_scanner:
+ stage: test_dependency_check_sonar_scanner
image:
name: its-registry.unl.edu/unl-its/docker-ci/static-code-analysis
cache:
@@ -27,9 +31,8 @@ test:dependency_check:sonar-scanner:
script:
- sonar-scanner -Dsonar.host.url=$SONAR_URL -Dsonar.projectKey=$CI_PROJECT_PATH_SLUG -Dsonar.sources=$SRC_DIR -Dsonar.login=$SONAR_TOKEN -Dsonar.dependencyCheck.reportPath=${DEPENDENCY_CHECK_OUT_DIR}/dependency-check-report.xml -Dsonar.dependencyCheck.htmlReportPath=${DEPENDENCY_CHECK_OUT_DIR}/dependency-check-report.html -Dsonar.scm.disabled=True
-test:dependency_check:dependency_check:
- stage: test
- needs: ["test:dependency_check:sonar-scanner"]
+test_dependency_check_dependency_check:
+ stage: test_dependency_check_dependency_check
image:
name: its-registry.unl.edu/unl-its/docker-ci/dependency-check
cache:
--
GitLab