From 6ab609907557d7185e6fb77e499cb418b92796a9 Mon Sep 17 00:00:00 2001
From: Ramzi El-Yafi <ramzi.el-yafi@r3.com>
Date: Wed, 3 Jun 2020 14:05:12 +0100
Subject: [PATCH 1/2] [INFRA-368] Add deployNodes and install gradle tasks
 (#6302)

---
 .ci/dev/nightly-regression/Jenkinsfile | 2 +-
 .ci/dev/regression/Jenkinsfile         | 2 +-
 Jenkinsfile                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ci/dev/nightly-regression/Jenkinsfile b/.ci/dev/nightly-regression/Jenkinsfile
index 2f4389a801..a122ea0fd3 100644
--- a/.ci/dev/nightly-regression/Jenkinsfile
+++ b/.ci/dev/nightly-regression/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                                 "-Ddocker.push.password=\"\${DOCKER_PUSH_PWD}\" " +
                                 "-Ddocker.work.dir=\"/tmp/\${EXECUTOR_NUMBER}\" " +
                                 "-Ddocker.build.tag=\"\${DOCKER_TAG_TO_USE}\"" +
-                                " clean pushBuildImage --stacktrace"
+                                " clean jar deployNodes install pushBuildImage --stacktrace"
                     }
                     sh "kubectl auth can-i get pods"
                 }
diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile
index 5ca24015bc..3cebf1840c 100644
--- a/.ci/dev/regression/Jenkinsfile
+++ b/.ci/dev/regression/Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
                             "-Ddocker.push.password=\"\${DOCKER_PUSH_PWD}\" " +
                             "-Ddocker.work.dir=\"/tmp/\${EXECUTOR_NUMBER}\" " +
                             "-Ddocker.build.tag=\"\${DOCKER_TAG_TO_USE}\"" +
-                            " clean pushBuildImage --stacktrace"
+                            " clean jar deployNodes install pushBuildImage --stacktrace"
                 }
                 sh "kubectl auth can-i get pods"
             }
diff --git a/Jenkinsfile b/Jenkinsfile
index 6d8e35669f..18837765aa 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
                             "-Ddocker.push.password=\"\${DOCKER_PUSH_PWD}\" " +
                             "-Ddocker.work.dir=\"/tmp/\${EXECUTOR_NUMBER}\" " +
                             "-Ddocker.build.tag=\"\${DOCKER_TAG_TO_USE}\"" +
-                            " clean pushBuildImage --stacktrace"
+                            " clean jar deployNodes pushBuildImage --stacktrace"
                 }
                 sh "kubectl auth can-i get pods"
             }

From cf8cd8e004b177c120e7cd6f7f2c0ba9d6310cc1 Mon Sep 17 00:00:00 2001
From: Razvan Codreanu <52859362+Schife@users.noreply.github.com>
Date: Fri, 5 Jun 2020 15:20:03 +0100
Subject: [PATCH 2/2] INFRA-348 JDK 11 Compatibility job migration (#6311)

---
 .ci/dev/compatibility/DockerfileJDK11Compile  |  9 +++++
 .ci/dev/compatibility/JenkinsfileJDK11Compile | 38 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 .ci/dev/compatibility/DockerfileJDK11Compile
 create mode 100644 .ci/dev/compatibility/JenkinsfileJDK11Compile

diff --git a/.ci/dev/compatibility/DockerfileJDK11Compile b/.ci/dev/compatibility/DockerfileJDK11Compile
new file mode 100644
index 0000000000..263c42a391
--- /dev/null
+++ b/.ci/dev/compatibility/DockerfileJDK11Compile
@@ -0,0 +1,9 @@
+FROM azul/zulu-openjdk:11
+RUN apt-get update && apt-get install -y curl apt-transport-https \
+                                              ca-certificates \
+                                              curl \
+                                              gnupg2 \
+                                              software-properties-common \
+                                              wget
+ARG USER="stresstester"
+RUN useradd -m ${USER}
\ No newline at end of file
diff --git a/.ci/dev/compatibility/JenkinsfileJDK11Compile b/.ci/dev/compatibility/JenkinsfileJDK11Compile
new file mode 100644
index 0000000000..670717da68
--- /dev/null
+++ b/.ci/dev/compatibility/JenkinsfileJDK11Compile
@@ -0,0 +1,38 @@
+@Library('corda-shared-build-pipeline-steps')
+import static com.r3.build.BuildControl.killAllExistingBuildsForJob
+
+killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
+
+pipeline {
+    agent {
+        dockerfile {
+            label 'k8s'
+            additionalBuildArgs "--build-arg USER=stresstester"
+            filename '.ci/dev/compatibility/DockerfileJDK11Compile'
+        }
+    }
+    options {
+        timestamps()
+        timeout(time: 3, unit: 'HOURS')
+    }
+
+    stages {
+        stage('JDK 11 Compile') {
+            steps {
+                sh "./gradlew --no-daemon -Pcompilation.allWarningsAsErrors=true -Ptests.failFast=false " +
+                "-Ptests.ignoreFailures=true clean compileAll --stacktrace"
+            }
+        }
+        stage('Deploy nodes') {
+            steps {
+                sh "./gradlew --no-daemon deployNodes"
+            }
+        }
+    }
+
+    post {
+        cleanup {
+            deleteDir() /* clean up our workspace */
+        }
+    }
+}
\ No newline at end of file