Adjust the gitlab-ci pipeline for Labradoor

.gitlab-ci.yml

@@ -24,8 +24,7 @@ variables:
 
 # The names of the stages we use
 stages:
-  - build 1
-  - build 2
+  - build
   - test
   - review
   - gitlab reports
@@ -44,20 +43,15 @@ stages:
 
 .gitlab_reporter:
   stage: gitlab reports
+  allow_failure: true
   needs:
     - gradle_build
 
 
-# Disable gemnasium maven manually, as apparently GitLab doesn't handle this properly internally
-gemnasium-maven-dependency_scanning:
-  rules:
-    - when: never
-  script: echo Oops
-
 # Runs gradle build without tests or checks
 gradle_build:
   extends: .build_cached
-  stage: build 1
+  stage: build
   rules:
     - if: $CI_COMMIT_BRANCH == "master" ||
         $CI_COMMIT_BRANCH == "development" ||
@@ -74,30 +68,6 @@ gradle_build:
   script:
     - gradle build testClasses -x test -x licenseMain -x licenseTest -x spotlessJava -x spotlessCheck
 
-
-# Generate the pom for dependency scanning
-generate_pom:
-  extends: .build_cached
-  stage: build 2
-  rules:
-    - if: $CI_PIPELINE_SOURCE == "trigger" ||
-        $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
-      when: never
-    - if: $CI_COMMIT_BRANCH == "master" ||
-        $CI_COMMIT_BRANCH == "development" ||
-        $CI_MERGE_REQUEST_ID
-  needs:
-    - gradle_build
-  artifacts:
-    name: pom
-    expire_in: 6 hours
-    paths:
-      - pom.xml
-  script:
-    - gradle install
-  after_script:
-    - cp build/poms/pom-*.xml pom.xml
-
 # Run tests
 gradle_test:
   extends: .build_cached
@@ -235,13 +205,25 @@ code_quality:
   stage: gitlab reports
 
 # Runs the SAST checks and reporter.
-sast:
-  extends:
-    - .build_cached
-    - .gitlab_reporter
+spotbugs-sast:
   variables:
     COMPILE: "false"
-    SECURE_LOG_LEVEL: "debug"
+  allow_failure: true
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "trigger" ||
+        $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
+      when: never
+    - if: $CI_COMMIT_BRANCH == "master" ||
+        $CI_COMMIT_BRANCH == "development" ||
+        $CI_MERGE_REQUEST_ID
+  stage: gitlab reports
+  needs:
+    - gradle_build
+  dependencies:
+    - gradle_build
+
+eslint-sast:
+  allow_failure: true
   rules:
     - if: $CI_PIPELINE_SOURCE == "trigger" ||
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
@@ -261,6 +243,8 @@ dast:
   extends:
     - .build_cached
     - .gitlab_reporter
+  tags:
+    - longJob
   rules:
     - if: $CI_PIPELINE_SOURCE == "trigger" ||
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
@@ -308,10 +292,7 @@ container_scanning:
     - export DOCKER_PASSWORD=$CI_REGISTRY_PASSWORD
 
 # Dependency scanning reporter for checking dependencies of Labradoor.
-dependency_scanning:
-  extends:
-    - .build_cached
-    - .gitlab_reporter
+gemnasium-maven-dependency_scanning:
   rules:
     - if: $CI_PIPELINE_SOURCE == "trigger" ||
         $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train"
@@ -319,16 +300,8 @@ dependency_scanning:
     - if: $CI_COMMIT_BRANCH == "master" ||
         $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID
-  needs:
-    - generate_pom
-  dependencies:
-    - generate_pom
-  before_script:
-    - rm build.gradle* gradlew gradlew.bat
-    - cat pom.xml
-  variables:
-    MAVEN_CLI_OPTS: -q -Dmaven.main.skip -Dmaven.test.skip=true -DskipTests --batch-mode
   stage: gitlab reports
+  allow_failure: true
 
 # License scanning reporter for checking the licenses of dependencies.
 license_scanning:
@@ -342,14 +315,6 @@ license_scanning:
     - if: $CI_COMMIT_BRANCH == "master" ||
         $CI_COMMIT_BRANCH == "development" ||
         $CI_MERGE_REQUEST_ID
-  needs:
-    - generate_pom
-  dependencies:
-    - generate_pom
   stage: gitlab reports
-  before_script:
-    - rm build.gradle* gradlew gradlew.bat
-    - cat pom.xml
   variables:
-    MAVEN_CLI_OPTS: -q -Dmaven.main.skip -Dmaven.test.skip=true -DskipTests --batch-mode
     LM_JAVA_VERSION: 11