From 5348fd39aef06e487892c07a123c7f3027680337 Mon Sep 17 00:00:00 2001
From: Jose Carrera <jose.carrera@amido.com>
Date: Mon, 15 Jul 2024 10:36:07 +0100
Subject: [PATCH] re-enables steps previously removed to speed up build

---
 .../azure/azure-pipelines-javaspring-k8s.yml  |  6 +-
 .../templates/steps/build/build-java.yml      | 68 ++++++++++++++++++-
 2 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/build/azDevOps/azure/azure-pipelines-javaspring-k8s.yml b/build/azDevOps/azure/azure-pipelines-javaspring-k8s.yml
index 8c0839ff..79911c75 100644
--- a/build/azDevOps/azure/azure-pipelines-javaspring-k8s.yml
+++ b/build/azDevOps/azure/azure-pipelines-javaspring-k8s.yml
@@ -144,8 +144,7 @@ variables:
 
   # Vulnerability Scan
   - name: vulnerability_scan
-    value: false
-    # setting to false to speed up testing of deploy
+    value: true
   - name: vulnerability_scan_report
     value: "target/dependency-check-report.html"
   - name: vulnerability_scan_api_key
@@ -241,8 +240,7 @@ stages:
               functional_test_artefact_path: "${{ variables.functional_test_artefact_path }}"
               pipeline_scripts_directory: "${{ variables.self_pipeline_scripts_dir }}"
               # Maven
-              maven_untagged_test_check: false
-              # set to false to speed up testing deploy step
+              maven_untagged_test_check: true
               maven_cache_directory: "${{ variables.maven_cache_directory }}"
               maven_allowed_post_deploy_test_tags: "${{ variables.maven_allowed_post_deploy_test_tags }}"
               maven_ignored_post_deploy_test_tags: "${{ variables.maven_ignored_post_deploy_test_tags }}"
diff --git a/build/azDevOps/azure/templates/steps/build/build-java.yml b/build/azDevOps/azure/templates/steps/build/build-java.yml
index fd459125..7b5f9274 100644
--- a/build/azDevOps/azure/templates/steps/build/build-java.yml
+++ b/build/azDevOps/azure/templates/steps/build/build-java.yml
@@ -88,4 +88,70 @@ steps:
     target:
       container: ${{ parameters.docker_build_container }}
     displayName: "Maven: Compile Application (${{ parameters.project_type }})"
-    #  TODO: Add removed stages back after validating deploy
+
+  - task: Bash@3
+    inputs:
+      filePath: "${{ parameters.pipeline_scripts_directory }}/test-maven-download-test-deps.bash"
+      arguments: >
+        -X "${{ parameters.maven_allowed_test_tags }}"
+        -Y "${{ parameters.maven_surefire_reports_dir }}"
+        -Z "${{ parameters.maven_cache_directory }}"
+      workingDirectory: "${{ parameters.project_root_dir }}"
+    target:
+      container: ${{ parameters.docker_build_container }}
+    displayName: "Test: Download Test Deps (${{ parameters.project_type }})"
+ 
+  - task: Bash@3
+    inputs:
+      filePath: "${{ parameters.pipeline_scripts_directory }}/test-maven-tagged-test-run.bash"
+      arguments: >
+        -a "Unit"
+        -Z "${{ parameters.maven_cache_directory }}"
+      workingDirectory: "${{ parameters.project_root_dir }}"
+    target:
+      container: ${{ parameters.docker_build_container }}
+    displayName: "Test: Unit tests (${{ parameters.project_type }})"
+ 
+  - task: Bash@3
+    inputs:
+      filePath: "${{ parameters.pipeline_scripts_directory }}/test-maven-tagged-test-run.bash"
+      arguments: >
+        -a "Component"
+        -Z "${{ parameters.maven_cache_directory }}"
+      workingDirectory: "${{ parameters.project_root_dir }}"
+    target:
+      container: ${{ parameters.docker_build_container }}
+    displayName: "Test: Component tests (${{ parameters.project_type }})"
+ 
+  - task: Bash@3
+    inputs:
+      filePath: "${{ parameters.pipeline_scripts_directory }}/test-maven-tagged-test-run.bash"
+      arguments: >
+        -a "Integration"
+        -Z "${{ parameters.maven_cache_directory }}"
+      workingDirectory: "${{ parameters.project_root_dir }}"
+    target:
+      container: ${{ parameters.docker_build_container }}
+    displayName: "Test: Integration tests (${{ parameters.project_type }})"
+ 
+  - task: Bash@3
+    inputs:
+      filePath: "${{ parameters.pipeline_scripts_directory }}/test-maven-generate-jacoco-report.bash"
+      arguments: >
+        -Z "${{ parameters.maven_cache_directory }}"
+      workingDirectory: "${{ parameters.project_root_dir }}"
+    target:
+      container: ${{ parameters.docker_build_container }}
+    displayName: "Generate Jacoco coverage reports (${{ parameters.project_type }})"
+ 
+  # TODO: Pull this out into a bash script?
+  - bash: |
+      set -euxo pipefail
+      cp "${{ parameters.repo_root_dir }}/build/azDevOps/azure/coverage/"* .
+      npm i
+      ./node_modules/.bin/gulp inline-css-images
+      ./node_modules/.bin/gulp inline-sources
+    workingDirectory: "${{ parameters.project_root_dir }}/target/site/"
+    target:
+      container: node
+    displayName: "Gulp: Inline Jacoco report assets (${{ parameters.project_type }})"