ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-30 09:48:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
NOTICK: Merging forward updates from OS 4.7 to OS 4.8 (2022-01-12)
This commit is contained in:
Waldemar Żurowski 2022-01-12 15:01:32 +01:00 committed by GitHub
commit 265a293666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.ci/dev/regression/Jenkinsfile vendored
View File

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

1
build.gradle
View File

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

9
samples/irs-demo/build.gradle
View File

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