after always (#970)

hmcts · Nov 1, 2023 · 9e27705 · 9e27705
1 parent d8aa1c6
commit 9e27705
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP
@@ -105,23 +105,23 @@ 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 """\
                 Using PREVIEW_ENVIRONMENT_NAME: ${env.PREVIEW_ENVIRONMENT_NAME}
                 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 """\
                 Using PREVIEW_ENVIRONMENT_NAME: ${env.PREVIEW_ENVIRONMENT_NAME}
                 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
@@ -59,15 +59,15 @@ try {
         enableCrossBrowserTest()
         enableFortifyScan('idam-idam-' + params.ENVIRONMENT)
 
-        afterSuccess('fortify-scan') {
+        afterAlways('fortify-scan') {
             steps.archiveArtifacts allowEmptyArchive: true, artifacts: '**/Fortify Scan/**/*'
         }
 
         before('fullFunctionalTest') {
             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
@@ -64,23 +64,23 @@ 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 """\
             Using PREVIEW_ENVIRONMENT_NAME: ${env.PREVIEW_ENVIRONMENT_NAME}
             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 """\
             Using PREVIEW_ENVIRONMENT_NAME: ${env.PREVIEW_ENVIRONMENT_NAME}
             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/**/*'