Merge pull request #7022 from corda/wz/merge-os-47-48-2022-01-12

NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-01-12)

.ci/dev/regression/Jenkinsfile

@@ -65,6 +65,7 @@ pipeline {
 
     parameters {
         choice choices: nexusIqStageChoices, description: 'NexusIQ stage for code evaluation', name: 'nexusIqStage'
+        booleanParam defaultValue: true, description: 'Run tests during this build?', name: 'DO_TEST'
     }
 
     /*
@@ -91,6 +92,9 @@ pipeline {
         }
 
         stage('Stash') {
+            when {
+                expression { params.DO_TEST }
+            }
             steps {
                 stash name: 'compiled', useDefaultExcludes: false
             }
@@ -115,6 +119,10 @@ pipeline {
         }
 
         stage('All Tests') {
+            when {
+                expression { params.DO_TEST }
+                beforeAgent true
+            }
             parallel {
                 stage('Another agent') {
                     agent {
@@ -321,10 +329,12 @@ pipeline {
         always {
             script {
                 try {
-                    unstash 'allure-input'
-                    allure includeProperties: false,
-                            jdk: '',
-                            results: [[path: '**/allure-input']]
+                    if (params.DO_TEST) {
+                        unstash 'allure-input'
+                        allure includeProperties: false,
+                                jdk: '',
+                                results: [[path: '**/allure-input']]
+                    }
                 } catch (err) {
                     echo("Allure report generation failed: $err")
 

build.gradle

@@ -404,6 +404,7 @@ allprojects {
                     includeGroup 'co.paralleluniverse'
                     includeGroup 'org.crashub'
                     includeGroup 'com.github.bft-smart'
+                    includeGroup 'com.github.detro'
                 }
             }
             maven {

samples/irs-demo/build.gradle

@@ -72,15 +72,6 @@ dependencies {
     testCompile "com.github.detro:ghostdriver:$ghostdriver_version"
 }
 
-repositories {
-    maven {
-        url 'https://maven.scijava.org/content/repositories/public/'
-        content {
-            includeGroup 'com.github.detro'
-        }
-    }
-}
-
 bootRepackage {
     enabled = false
 }