From 444c8694a4836897e7a3a1c6d9b90b3d80befd85 Mon Sep 17 00:00:00 2001
From: Axel Catoire <axel.catoire@qlik.com>
Date: Tue, 31 Dec 2024 11:33:10 +0100
Subject: [PATCH 1/3] chore(QTDI-740) Remove POST_LOGIN_SCRIPT
 https://qlik-dev.atlassian.net/browse/QTDI-740

---
 Jenkinsfile | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9bfb7a9cdac54..e04e7eae64a09 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -61,7 +61,6 @@ final String branch_name = pull_request_id != null ? env.CHANGE_BRANCH : env.BRA
 // Job config
 final Boolean isMasterBranch = branch_name == "master"
 final Boolean isStdBranch = (branch_name == "master" || branch_name.startsWith("maintenance/"))
-final Boolean hasPostLoginScript = params.POST_LOGIN_SCRIPT != ""
 final String extraBuildParams = ""
 final String buildTimestamp = String.format('-%tY%<tm%<td%<tH%<tM%<tS', LocalDateTime.now())
 final String artifactoryAddr = "https://artifactory.datapwn.com"
@@ -197,10 +196,6 @@ pipeline {
         name: 'EXTRA_BUILD_PARAMS',
         defaultValue: '',
         description: 'Add some extra parameters to maven commands. Applies to all maven calls.')
-    string(
-        name: 'POST_LOGIN_SCRIPT',
-        defaultValue: '',
-        description: 'Execute a shell command after login. Useful for maintenance.')
     booleanParam(
         name: 'DISABLE_SONAR',
         defaultValue: false,
@@ -403,15 +398,17 @@ pipeline {
                          jiraCredentials,
                          gpgCredentials]) {
           script {
-            try {
-              sh """\
-                            #!/usr/bin/env bash
-                            bash "${params.POST_LOGIN_SCRIPT}"
-                            bash .jenkins/scripts/npm_fix.sh
-                            """.stripIndent()
-            } catch (ignored) {
-              //
-            }
+            sh """\
+              #!/usr/bin/env bash
+              bash .jenkins/scripts/npm_fix.sh
+              """.stripIndent()
+
+            // Uncomment this and add bash command if needed using replay function
+            // This replace the POST_LOGIN_SCRIPT variable used prior to https://qlik-dev.atlassian.net/browse/QTDI-740
+            // sh """\
+            //  #!/usr/bin/env bash
+            //  bash but anything needed here
+            //  """.stripIndent()
           }
         }
       }

From cbb5ed55ea2c4419d98be77701f887c96dbe7c95 Mon Sep 17 00:00:00 2001
From: Axel Catoire <axel.catoire@qlik.com>
Date: Tue, 31 Dec 2024 15:26:07 +0100
Subject: [PATCH 2/3] chore(QTDI-740) Remove POST_LOGIN_SCRIPT
 https://qlik-dev.atlassian.net/browse/QTDI-740

---
 Jenkinsfile | 56 ++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index e04e7eae64a09..e393ec502f0dd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -403,7 +403,7 @@ pipeline {
               bash .jenkins/scripts/npm_fix.sh
               """.stripIndent()
 
-            // Uncomment this and add bash command if needed using replay function
+            // If needed, use jenkins replay function then uncomment this to add your temporary bash command
             // This replace the POST_LOGIN_SCRIPT variable used prior to https://qlik-dev.atlassian.net/browse/QTDI-740
             // sh """\
             //  #!/usr/bin/env bash
@@ -419,12 +419,12 @@ pipeline {
         withCredentials([ossrhCredentials,
                          nexusCredentials]) {
           sh """\
-                    #!/usr/bin/env bash
-                    set -xe
-                    mvn clean install $BUILD_ARGS \
-                                      $extraBuildParams \
-                                      --settings .jenkins/settings.xml
-                    """.stripIndent()
+            #!/usr/bin/env bash
+            set -xe
+            mvn clean install $BUILD_ARGS \
+                              $extraBuildParams \
+                              --settings .jenkins/settings.xml
+            """.stripIndent()
         }
       }
       post {
@@ -455,12 +455,12 @@ pipeline {
                            gpgCredentials,
                            nexusCredentials]) {
             sh """\
-                        #!/usr/bin/env bash
-                        set -xe
-                        bash mvn deploy $deployOptions \
-                                        $extraBuildParams \
-                                        --settings .jenkins/settings.xml
-                        """.stripIndent()
+              #!/usr/bin/env bash
+              set -xe
+              bash mvn deploy $deployOptions \
+                              $extraBuildParams \
+                              --settings .jenkins/settings.xml
+              """.stripIndent()
           }
         }
         // Add description to job
@@ -531,10 +531,10 @@ pipeline {
 
             // Build and push specific image
             sh """
-                              bash .jenkins/scripts/docker_build.sh \
-                                ${finalVersion}${buildTimestamp} \
-                                ${images_options}
-                            """
+                bash .jenkins/scripts/docker_build.sh \
+                  ${finalVersion}${buildTimestamp} \
+                  ${images_options}
+              """
           }
 
         }
@@ -549,15 +549,15 @@ pipeline {
       steps {
         withCredentials([ossrhCredentials, gitCredentials]) {
           sh """\
-                    #!/usr/bin/env bash 
-                    set -xe                       
-                    mvn verify pre-site --file documentation/pom.xml \
-                                        --settings .jenkins/settings.xml \
-                                        --activate-profiles gh-pages \
-                                        --define gpg.skip=true \
-                                        $skipOptions \
-                                        $extraBuildParams 
-                    """.stripIndent()
+            #!/usr/bin/env bash 
+            set -xe                       
+            mvn verify pre-site --file documentation/pom.xml \
+                                --settings .jenkins/settings.xml \
+                                --activate-profiles gh-pages \
+                                --define gpg.skip=true \
+                                $skipOptions \
+                                $extraBuildParams 
+            """.stripIndent()
         }
       }
     }
@@ -572,8 +572,8 @@ pipeline {
         withCredentials([ossrhCredentials]) {
           catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
             sh """
-                            bash .jenkins/scripts/mvn-ossindex-audit.sh
-                        """
+               bash .jenkins/scripts/mvn-ossindex-audit.sh
+               """
           }
         }
       }

From b3cf1e1fbd0a5a9ba40ac1a5f78af65edc6a9c77 Mon Sep 17 00:00:00 2001
From: Axel Catoire <axel.catoire@qlik.com>
Date: Tue, 31 Dec 2024 16:06:05 +0100
Subject: [PATCH 3/3] chore(QTDI-740) Remove POST_LOGIN_SCRIPT
 https://qlik-dev.atlassian.net/browse/QTDI-740

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ba62ad745792f..03511b5c9a8b5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -376,7 +376,7 @@ pipeline {
           // updating build description
           String description = """
                       Version = $finalVersion - $params.Action Build  
-                      Disable Sonar: $params.DISABLE_SONAR - Script: $hasPostLoginScript  
+                      Disable Sonar: $params.DISABLE_SONAR  
                       Debug: $params.JENKINS_DEBUG  
                       Extra build args: $extraBuildParams  """.stripIndent()
           jenkinsJobTools.job_description_append(description)