From 9e2770554bd8e4fd2cab20cf28f6df2f3711947c Mon Sep 17 00:00:00 2001
From: James Burke <james.burke@hmcts.net>
Date: Wed, 1 Nov 2023 14:01:50 +0000
Subject: [PATCH] after always (#970)

---
 Jenkinsfile_CNP           | 16 ++++++++--------
 Jenkinsfile_nightly       |  4 ++--
 Jenkinsfile_parameterized | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP
index b2642e299..e84e958ce 100644
--- a/Jenkinsfile_CNP
+++ b/Jenkinsfile_CNP
@@ -105,7 +105,7 @@ withPipeline(type, product, component) {
                 Using ITHC_ENVIRONMENT_NAME: ${env.ITHC_ENVIRONMENT_NAME}""".stripIndent()
     }
 
-    afterSuccess('akschartsinstall') {
+    afterAlways('akschartsinstall') {
         env.PREVIEW_ENVIRONMENT_NAME = 'idam-preview'
         env.NONPROD_ENVIRONMENT_NAME = 'idam-aat'
         println """\
@@ -113,7 +113,7 @@ withPipeline(type, product, component) {
                 Using NONPROD_ENVIRONMENT_NAME: ${env.NONPROD_ENVIRONMENT_NAME}""".stripIndent()
     }
 
-    afterSuccess('smoketest:idam-preview') {
+    afterAlways('smoketest:idam-preview') {
         env.PREVIEW_ENVIRONMENT_NAME = 'idam-preview'
         env.NONPROD_ENVIRONMENT_NAME = 'idam-aat'
         println """\
@@ -121,7 +121,7 @@ withPipeline(type, product, component) {
                 Using NONPROD_ENVIRONMENT_NAME: ${env.NONPROD_ENVIRONMENT_NAME}""".stripIndent()
     }
 
-    afterSuccess('functionalTest:idam-preview') {
+    afterAlways('functionalTest:idam-preview') {
         env.PREVIEW_ENVIRONMENT_NAME = 'idam-preview'
         env.NONPROD_ENVIRONMENT_NAME = 'idam-aat'
         println """\
@@ -130,7 +130,7 @@ withPipeline(type, product, component) {
     }
     // End AKS Callbacks
 
-    afterSuccess('test') {
+    afterAlways('test') {
         publishHTML target: [
             allowMissing         : true,
             alwaysLinkToLastBuild: true,
@@ -142,7 +142,7 @@ withPipeline(type, product, component) {
 
     }
 
-    afterSuccess('smoketest:idam-preview') {
+    afterAlways('smoketest:idam-preview') {
         archiveArtifacts '**/build/test-results/**/*'
 
         publishHTML target: [
@@ -155,7 +155,7 @@ withPipeline(type, product, component) {
         ]
     }
 
-    afterSuccess('smoketest:idam-aat') {
+    afterAlways('smoketest:idam-aat') {
         archiveArtifacts '**/build/test-results/**/*'
 
         publishHTML target: [
@@ -168,7 +168,7 @@ withPipeline(type, product, component) {
         ]
     }
 
-    afterSuccess('functionalTest:idam-preview') {
+    afterAlways('functionalTest:idam-preview') {
         archiveArtifacts '**/build/test-results/**/*'
         archiveArtifacts '**/functional-output/**/*'
 
@@ -182,7 +182,7 @@ withPipeline(type, product, component) {
         ]
     }
 
-    afterSuccess('functionalTest:idam-aat') {
+    afterAlways('functionalTest:idam-aat') {
         env.TESTS_FOR_ACCESSIBILITY = false
         env.WAIT_FOR_ACTION_TIMEOUT = 500
         archiveArtifacts '**/build/test-results/**/*'
diff --git a/Jenkinsfile_nightly b/Jenkinsfile_nightly
index ec3672895..7a358c2fd 100644
--- a/Jenkinsfile_nightly
+++ b/Jenkinsfile_nightly
@@ -59,7 +59,7 @@ try {
         enableCrossBrowserTest()
         enableFortifyScan('idam-idam-' + params.ENVIRONMENT)
 
-        afterSuccess('fortify-scan') {
+        afterAlways('fortify-scan') {
             steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/Fortify Scan/**/*'
         }
 
@@ -67,7 +67,7 @@ try {
             env.TESTS_FOR_ACCESSIBILITY = true
         }
 
-        afterSuccess('fullFunctionalTest') {
+        afterAlways('fullFunctionalTest') {
             steps.archiveArtifacts allowEmptyArchive: true, artifacts: 'output/**/*'
             env.TESTS_FOR_ACCESSIBILITY = false
 
diff --git a/Jenkinsfile_parameterized b/Jenkinsfile_parameterized
index b336a462f..d55038bda 100644
--- a/Jenkinsfile_parameterized
+++ b/Jenkinsfile_parameterized
@@ -64,7 +64,7 @@ withParameterizedPipeline(type, product, component, params.ENVIRONMENT, params.S
             Using IDAMAPI: ${env.IDAMAPI}""".stripIndent()
   }
 
-  afterSuccess('akschartsinstall') {
+  afterAlways('akschartsinstall') {
     env.PREVIEW_ENVIRONMENT_NAME = 'idam-preview'
     env.NONPROD_ENVIRONMENT_NAME = 'idam-aat'
     println """\
@@ -72,7 +72,7 @@ withParameterizedPipeline(type, product, component, params.ENVIRONMENT, params.S
             Using NONPROD_ENVIRONMENT_NAME: ${env.NONPROD_ENVIRONMENT_NAME}""".stripIndent()
   }
   
-  afterSuccess('smoketest:idam-preview') {
+  afterAlways('smoketest:idam-preview') {
     env.PREVIEW_ENVIRONMENT_NAME = 'idam-preview'
     env.NONPROD_ENVIRONMENT_NAME = 'idam-aat'
     println """\
@@ -80,7 +80,7 @@ withParameterizedPipeline(type, product, component, params.ENVIRONMENT, params.S
             Using NONPROD_ENVIRONMENT_NAME: ${env.NONPROD_ENVIRONMENT_NAME}""".stripIndent()
   }
 
-  afterSuccess('functionalTest:idam-preview') {
+  afterAlways('functionalTest:idam-preview') {
     env.PREVIEW_ENVIRONMENT_NAME = 'idam-preview'
     env.NONPROD_ENVIRONMENT_NAME = 'idam-aat'
     println """\
@@ -89,7 +89,7 @@ withParameterizedPipeline(type, product, component, params.ENVIRONMENT, params.S
   }
   // End AKS Callbacks
   
-  afterSuccess('test') {
+  afterAlways('test') {
     publishHTML target: [
         allowMissing         : true,
         alwaysLinkToLastBuild: true,
@@ -101,7 +101,7 @@ withParameterizedPipeline(type, product, component, params.ENVIRONMENT, params.S
 
   }
 
-  afterSuccess('smoketest:idam-preview') {
+  afterAlways('smoketest:idam-preview') {
     archiveArtifacts '**/build/test-results/**/*'
 
     publishHTML target: [
@@ -114,7 +114,7 @@ withParameterizedPipeline(type, product, component, params.ENVIRONMENT, params.S
     ]
   }
 
-  afterSuccess('functionalTest:idam-preview') {
+  afterAlways('functionalTest:idam-preview') {
     archiveArtifacts '**/build/test-results/**/*'
     archiveArtifacts '**/functional-output/**/*'