Remove unnecessary stage, use the gradlew build outputs

Modify gitlab sast configuration

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>

.gitlab-ci.yml

@@ -12,8 +12,8 @@ cache:
 # Various additional Checks #
 #############################
 include:
-  - template: Code-Quality.gitlab-ci.yml
   - template: SAST.gitlab-ci.yml
+    #- template: Code-Quality.gitlab-ci.yml
     #- template: Dependency-Scanning.gitlab-ci.yml
     #- template: Container-Scanning.gitlab-ci.yml
     #- template: DAST.gitlab-ci.yml
@@ -22,6 +22,7 @@ include:
 sast:
   variables:
     GRADLE_PATH: "./gradlew"
+    CI_DEBUG_TRACE: "true"
 
 ###############
 # Build stage #
@@ -75,6 +76,10 @@ build:
   artifacts:
     paths:
     - build
+    reports:
+      junit: build/test-results/test/TEST-*.xml
+      codequality: build/reports/pmd/main.xml
+      sast: build/reports/spotbugs/main.html
   dependencies:
   - assemble
 
@@ -119,17 +124,6 @@ build with java 13:
     - assemble with java 13
   allow_failure: true
 
-tests:
-  stage: test
-  script:
-  - ./gradlew check test jacocoTestReport
-  artifacts:
-    reports:
-      junit: build/test-results/test/TEST-*.xml
-      codequality: build/reports/pmd/main.xml
-      sast: build/reports/spotbugs/main.html
-  allow_failure: true
-
 ################
 # Deploy stage #
 ################
@@ -139,7 +133,7 @@ tests:
 #  stage: deploy
 #  environment:
 #    name: transifex
-#    url: https://www.transifex.com/josm/josm/josm-plugin_$CI_PROJECT_NAME
+#    url: https://www.transifex.com/josm/josm/josm-plugin_rapid/
 #  before_script:
 #  - apt-get update && apt-get install -yq gettext git
 #  - pip install git+https://github.com/transifex/transifex-client.git
@@ -148,18 +142,18 @@ tests:
 #  dependencies:
 #  - build
 #  only:
-#  - master@$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
+#  - master@smocktaylor/rapid
 
 release:
   stage: deploy
   environment:
     name: pages branch / dist directory
-    url: https://gitlab.com/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/tree/pages/public/dist
+    url: https://gitlab.com/smocktaylor/rapid/tree/pages/public/dist
   script:
   - &clone_pages_branch |
     echo "$SSH_PRIVATE_DEPLOY_KEY" > ~/.ssh/id_rsa
     chmod 600 ~/.ssh/id_rsa
-    git clone --depth 1 --branch pages git@gitlab.com:$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME.git pages
+    git clone --depth 1 --branch pages git@gitlab.com:smocktaylor/rapid.git pages
   - |
     version=`git describe --always --dirty`
     longVersion=`git describe --always --long --dirty`
@@ -172,20 +166,20 @@ release:
   - &push_pages_branch |
     cd pages/
     git config user.name "Deploy with GitLab CI"
-    git config user.email "$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME@$CI_SERVER_HOST"
+    git config user.email "smocktaylor/rapid@gitlab.com"
     git stage .
     git commit -a -m "$commitMessage"
     git push origin pages
   dependencies:
   - build
   only:
-  - tags@$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
+  - tags@smocktaylor/rapid
 
 publish master update site:
   stage: deploy
   environment:
     name: pages branch / snapshot update site
-    url: https://gitlab.com/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/tree/pages
+    url: https://gitlab.com/smocktaylor/rapid/tree/pages
   script:
   - *clone_pages_branch
   - |
@@ -200,16 +194,16 @@ publish master update site:
   dependencies:
   - build
   only:
-  - master@$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
+  - master@smocktaylor/rapid
 
 publish to / GitLab.com packages:
   stage: deploy
   environment:
-    name: GitLab.com / JOSM-$CI_PROJECT_NAME packages
-    url: https://gitlab.com/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/-/packages
+    name: GitLab.com / JOSM-rapid packages
+    url: https://gitlab.com/smocktaylor/rapid/-/packages
   script:
   - ./gradlew publishPluginPublicationToGitlabRepository
   dependencies:
   - build
   only:
-  - tags@$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME
+  - tags@smocktaylor/rapid