diff --git a/.ci/dev/publish-branch/Jenkinsfile.nightly b/.ci/dev/publish-branch/Jenkinsfile.nightly index 8da034693c..b915590679 100644 --- a/.ci/dev/publish-branch/Jenkinsfile.nightly +++ b/.ci/dev/publish-branch/Jenkinsfile.nightly @@ -33,18 +33,6 @@ def nexusIqStageChoices = [nexusDefaultIqStage].plus( 'operate' ].minus([nexusDefaultIqStage])) -/** - * define an empty teamsWebHookURL and if it is a Release Branch - * then set it for the Corda 4 Jenkins Connector - */ -boolean isReleaseBranch = (env.BRANCH_NAME =~ /^release\/os\/.*/) -def teamsWebHookURL = "" -if (isReleaseBranch){ - withCredentials([string(credentialsId: 'ms-teams-webhook', variable: 'webhook_url')]) { - teamsWebHookURL = "$webhook_url" - } -} - pipeline { agent { label 'standard' } @@ -54,18 +42,6 @@ pipeline { overrideIndexTriggers(false) timeout(time: 3, unit: 'HOURS') buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14')) - office365ConnectorWebhooks([[ - name : "Corda 4 Jenkins Connector", - notifyBackToNormal : true, - startNotification : false, - notifyFailure : true, - notifySuccess : true, - notifyNotBuilt : false, - notifyAborted : false, - notifyRepeatedFailure: true, - notifyUnstable : true, - url : "${teamsWebHookURL}" - ]]) } parameters { diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile index acfd722099..3ec8e7a8a8 100644 --- a/.ci/dev/regression/Jenkinsfile +++ b/.ci/dev/regression/Jenkinsfile @@ -124,6 +124,73 @@ pipeline { ) } } + stage('Generate Wiki Report') { + when { + expression { isReleaseTag && !isInternalRelease && !isReleaseCandidate && !isReleasePatch } + beforeAgent true + } + agent { + docker { + image 'nexusiq-sonatype-cli:latest' + reuseNode true + registryUrl 'https://engineering-docker.software.r3.com/' + registryCredentialsId 'artifactory-credentials' + } + } + options { + retry(3) + } + environment { + NEXUS_APP_ID="${nexusAppId}" + NEXUS_APP_STAGE="${params.nexusIqStage}" + NEXUSIQ_CREDENTIALS = credentials('jenkins-nexusiq-credentials') + } + steps { + sh '''\ + rm -f wiki-report.md + env NEXUSIQ_USERNAME="${NEXUSIQ_CREDENTIALS_USR}" \ + NEXUSIQ_PASSWORD="${NEXUSIQ_CREDENTIALS_PSW}" \ + /opt/app/wrapper wiki-report \ + --app "${NEXUS_APP_ID}" \ + --stage "${NEXUS_APP_STAGE}" >wiki-report.md + '''.stripIndent() + archiveArtifacts 'wiki-report.md' + } + } + stage('Generate Licence Report') { + when { + expression { isReleaseTag && !isInternalRelease && !isReleaseCandidate && !isReleasePatch } + beforeAgent true + } + agent { + docker { + image 'nexusiq-licence-report:latest' + reuseNode true + registryUrl 'https://engineering-docker.software.r3.com/' + registryCredentialsId 'artifactory-credentials' + } + } + options { + retry(3) + } + environment { + NEXUS_APP_ID="${nexusAppId}" + NEXUS_APP_STAGE="${params.nexusIqStage}" + NEXUSIQ_CREDENTIALS = credentials('jenkins-nexusiq-credentials') + } + steps { + sh '''\ + rm -rf report + env NEXUSIQ_USERNAME="${NEXUSIQ_CREDENTIALS_USR}" \ + NEXUSIQ_PASSWORD="${NEXUSIQ_CREDENTIALS_PSW}" \ + /opt/app/wrapper --write --outdir report \ + --force \ + --app "${NEXUS_APP_ID}" \ + --stage "${NEXUS_APP_STAGE}" + '''.stripIndent() + archiveArtifacts 'report/*.md' + } + } stage('All Tests') { when { diff --git a/constants.properties b/constants.properties index 73d05b7410..7e04ec28b9 100644 --- a/constants.properties +++ b/constants.properties @@ -14,7 +14,7 @@ java8MinUpdateVersion=171 platformVersion=11 guavaVersion=28.0-jre # Quasar version to use with Java 8: -quasarVersion=0.7.14_r3 +quasarVersion=0.7.15_r3 # Quasar version to use with Java 11: quasarVersion11=0.8.1_r3 jdkClassifier11=jdk11