From 8e368a2b767be53a4c9a650ea82bb952c2aa2477 Mon Sep 17 00:00:00 2001
From: Waldemar Zurowski <waldemar.zurowski@r3.com>
Date: Fri, 7 Aug 2020 11:44:14 +0200
Subject: [PATCH] Synched JDK11 Azul builds configuration with regression build

* carries over INFRA-541 and INFRA-542
---
 .ci/dev/compatibility/JenkinsfileJDK11Azul | 29 +++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/.ci/dev/compatibility/JenkinsfileJDK11Azul b/.ci/dev/compatibility/JenkinsfileJDK11Azul
index 391a2b5fc6..cad8473b1c 100644
--- a/.ci/dev/compatibility/JenkinsfileJDK11Azul
+++ b/.ci/dev/compatibility/JenkinsfileJDK11Azul
@@ -25,15 +25,28 @@ boolean isReleaseTag = (env.TAG_NAME =~ /^release.*JDK11$/)
 **  * stage-release:  for release candidates and for health checks
 **  * operate: for final release
 */
-def nexusIqStage = "build"
+def nexusDefaultIqStage = "build"
 if (isReleaseTag) {
     switch (env.TAG_NAME) {
-        case ~/.*-RC\d+(-.*)?/: nexusIqStage = "stage-release"; break;
-        case ~/.*-HC\d+(-.*)?/: nexusIqStage = "stage-release"; break;
-        default: nexusIqStage = "release"
+        case ~/.*-RC\d+(-.*)?/: nexusDefaultIqStage = "stage-release"; break;
+        case ~/.*-HC\d+(-.*)?/: nexusDefaultIqStage = "stage-release"; break;
+        default: nexusDefaultIqStage = "release"
     }
 }
 
+/**
+ * make sure calculated default value of NexusIQ stage is first in the list
+ * thus making it default for the `choice` parameter
+ */
+def nexusIqStageChoices = [nexusDefaultIqStage].plus(
+                [
+                        'develop',
+                        'build',
+                        'stage-release',
+                        'release',
+                        'operate'
+                ].minus([nexusDefaultIqStage]))
+
 pipeline {
     agent { label 'k8s' }
     options {
@@ -42,6 +55,10 @@ pipeline {
         buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14'))
     }
 
+    parameters {
+        choice choices: nexusIqStageChoices, description: 'NexusIQ stage for code evaluation', name: 'nexusIqStage'
+    }
+
     environment {
         DOCKER_TAG_TO_USE = "${env.GIT_COMMIT.subSequence(0, 8)}JDK11"
         EXECUTOR_NUMBER = "${env.EXECUTOR_NUMBER}"
@@ -62,13 +79,13 @@ pipeline {
                     def version = sh (returnStdout: true, script: "grep ^version: version-properties | sed -e 's/^version: \\([0-9]\\+\\.[0-9]\\+\\).*\$/\\1/'").trim()
                     def groupId = sh (returnStdout: true, script: "grep ^group: version-properties | sed -e 's/^group: //'").trim()
                     def artifactId = 'corda'
-                    nexusAppId = "jenkins-${groupId}-${artifactId}-jdk11-${version}"
+                    nexusAppId = "${groupId}-${artifactId}-${version}"
                 }
                 nexusPolicyEvaluation (
                         failBuildOnNetworkError: false,
                         iqApplication: selectedApplication(nexusAppId), // application *has* to exist before a build starts!
                         iqScanPatterns: [[scanPattern: 'node/capsule/build/libs/corda*.jar']],
-                        iqStage: nexusIqStage
+                        iqStage: params.nexusIqStage
                 )
             }
         }