Update .gitlab-ci.yml, .gitlab/ci/test.dependency_check.yml files

.gitlab-ci.yml

@@ -3,8 +3,8 @@ stages:
   - build
   - test
   - test_dependency_check_npm_install
-  - test_dependency_check_sonar_scanner
   - test_dependency_check_dependency_check
+  - test_dependency_check_sonar_scanner
   - publish
   - security
 

.gitlab/ci/test.dependency_check.yml

+variables:
+  DEPENDENCY_CHECK_OUT_DIR: t/dependency-check/simple-app/dependency_check_results/
+  SRC_DIR: t/dependency-check/simple-app/
+
 test_dependency_check_npm_install:
   stage: test_dependency_check_npm_install
   tags:
@@ -10,22 +14,6 @@ test_dependency_check_npm_install:
     - cd t/dependency-check/simple-app/
     - 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:
-    policy: pull
-    paths:
-      - t/dependency-check/simple-app/dependency_check_results/
-  variables:
-    DEPENDENCY_CHECK_OUT_DIR: t/dependency-check/simple-app/dependency_check_results/
-    SRC_DIR: t/dependency-check/simple-app/
-  tags:
-    - docker
-  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_dependency_check_dependency_check
   image: 
@@ -34,9 +22,6 @@ test_dependency_check_dependency_check:
     policy: pull
     paths:
       - t/dependency-check/simple-app/dependency_check_results/
-  variables:
-    DEPENDENCY_CHECK_OUT_DIR: t/dependency-check/simple-app/dependency_check_results/
-    SRC_DIR: t/dependency-check/simple-app/
   tags:
     - docker
   script:
@@ -47,3 +32,15 @@ test_dependency_check_dependency_check:
       - t/dependency-check/simple-app/dependency_check_results/dependency-check-report.xml
     expire_in: 1 day
 
+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:
+    policy: pull
+    paths:
+      - t/dependency-check/simple-app/dependency_check_results/
+  tags:
+    - docker
+  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