add ability to tigger smoke tests on arbitrary PR

.ci/dev/smoke/Jenkinsfile

@@ -4,22 +4,24 @@ import static com.r3.build.BuildControl.killAllExistingBuildsForJob
 killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger())
 
 pipeline {
+    agent { label 'k8s' }
+    options { timestamps() }
+
     triggers {
         issueCommentTrigger('.*smoke tests.*')
     }
 
-    agent { label 'k8s' }
-    options { timestamps() }
-
     environment {
-        DOCKER_TAG_TO_USE = "${env.GIT_COMMIT.subSequence(0, 8)}st"
+        DOCKER_TAG_TO_USE = "${env.GIT_COMMIT.subSequence(0, 8)}"
         EXECUTOR_NUMBER = "${env.EXECUTOR_NUMBER}"
         BUILD_ID = "${env.BUILD_ID}-${env.JOB_NAME}"
+        ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials')
     }
 
     stages {
-        stage('Smoke Tests') {
+        stage('Corda Smoke Tests - Generate Build Image') {
             steps {
+
                 script {
                     pullRequest.createStatus(status: 'pending',
                             context: 'continuous-integration/jenkins/pr-merge/smokeTest',
@@ -29,24 +31,50 @@ pipeline {
 
                 withCredentials([string(credentialsId: 'container_reg_passwd', variable: 'DOCKER_PUSH_PWD')]) {
                     sh "./gradlew " +
-                            "-DbuildId=\"\${BUILD_ID}\" " +
                             "-Dkubenetize=true " +
-                            "-DpreAllocatePods=true " +
                             "-Ddocker.push.password=\"\${DOCKER_PUSH_PWD}\" " +
                             "-Ddocker.work.dir=\"/tmp/\${EXECUTOR_NUMBER}\" " +
                             "-Ddocker.build.tag=\"\${DOCKER_TAG_TO_USE}\"" +
-                            " allParallelSmokeTest"
+                            " clean pushBuildImage --stacktrace"
                 }
+
+
+                sh "kubectl auth can-i get pods"
+            }
+        }
+
+        stage('Smoke Tests') {
+
+            steps {
+
+                script {
+                    pullRequest.createStatus(status: 'pending',
+                            context: 'continuous-integration/jenkins/pr-merge/smokeTest',
+                            description: 'Smoke Tests Running',
+                            targetUrl: "${env.JOB_URL}")
+                }
+
+                sh "./gradlew " +
+                        "-DbuildId=\"\${BUILD_ID}\" " +
+                        "-Dkubenetize=true " +
+                        "-Ddocker.run.tag=\"\${DOCKER_TAG_TO_USE}\" " +
+                        "-Dartifactory.username=\"\${ARTIFACTORY_CREDENTIALS_USR}\" " +
+                        "-Dartifactory.password=\"\${ARTIFACTORY_CREDENTIALS_PSW}\" " +
+                        "-Dgit.branch=\"\${GIT_BRANCH}\" " +
+                        "-Dgit.target.branch=\"\${GIT_BRANCH}\" " +
+                        " allParallelSmokeTest --stacktrace"
             }
         }
     }
 
-    post {
 
+    post {
         always {
-            junit testResults: '**/build/test-results-xml/**/*.xml', allowEmptyResults: false
+            archiveArtifacts artifacts: '**/pod-logs/**/*.log', fingerprint: false
+            junit '**/build/test-results-xml/**/*.xml'
         }
 
+
         success {
             script {
                 pullRequest.createStatus(status: 'success',
@@ -70,3 +98,17 @@ pipeline {
         }
     }
 }
+
+//@NonCPS
+//static def currentBuildTriggeredByComment(){
+//    def triggerCause = currentBuild.rawBuild.getCause(org.jenkinsci.plugins.pipeline.github.trigger.IssueCommentCause)
+//    if (triggerCause) {
+//        echo("Build was started by ${triggerCause.userLogin}, who wrote: " +
+//                "\"${triggerCause.comment}\", which matches the " +
+//                "\"${triggerCause.triggerPattern}\" trigger pattern.")
+//    } else {
+//        echo('Build was not started by a trigger')
+//    }
+//
+//    return triggerCause == null
+//}