diff --git a/.ci/dev/compatibility/JenkinsfileJDK11Azul b/.ci/dev/compatibility/JenkinsfileJDK11Azul index 11e727b124..23e9e4bf95 100644 --- a/.ci/dev/compatibility/JenkinsfileJDK11Azul +++ b/.ci/dev/compatibility/JenkinsfileJDK11Azul @@ -19,34 +19,6 @@ killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger()) */ boolean isReleaseTag = (env.TAG_NAME =~ /^release.*JDK11$/) -/* -** calculate the stage for NexusIQ evaluation -** * build for snapshots -** * stage-release: for release candidates and for health checks -** * release: for GA release -*/ -def nexusDefaultIqStage = "build" -if (isReleaseTag) { - switch (env.TAG_NAME) { - case ~/.*-RC\d+(-.*)?/: nexusDefaultIqStage = "stage-release"; break; - case ~/.*-HC\d+(-.*)?/: nexusDefaultIqStage = "stage-release"; break; - default: nexusDefaultIqStage = "release" - } -} - -/** - * make sure calculated default value of NexusIQ stage is first in the list - * thus making it default for the `choice` parameter - */ -def nexusIqStageChoices = [nexusDefaultIqStage].plus( - [ - 'develop', - 'build', - 'stage-release', - 'release', - 'operate' - ].minus([nexusDefaultIqStage])) - /** * Common Gradle arguments for all Gradle executions */ @@ -84,10 +56,6 @@ pipeline { timestamps() } - parameters { - choice choices: nexusIqStageChoices, description: 'NexusIQ stage for code evaluation', name: 'nexusIqStage' - } - /* * List environment variables in alphabetical order */ @@ -119,27 +87,6 @@ pipeline { } } - stage('Sonatype Check') { - steps { - dir(sameAgentFolder) { - script { - sh "./gradlew --no-daemon properties | grep -E '^(version|group):' >version-properties" - /* every build related to Corda X.Y (GA, RC, HC, patch or snapshot) uses the same NexusIQ application */ - def version = sh(returnStdout: true, script: "grep ^version: version-properties | sed -e 's/^version: \\([0-9]\\+\\(\\.[0-9]\\+\\)\\+\\).*\$/\\1/'").trim() - def groupId = sh(returnStdout: true, script: "grep ^group: version-properties | sed -e 's/^group: //'").trim() - def artifactId = 'corda' - nexusAppId = "${groupId}-${artifactId}-${version}" - } - nexusPolicyEvaluation( - failBuildOnNetworkError: false, - iqApplication: selectedApplication(nexusAppId), // application *has* to exist before a build starts! - iqScanPatterns: [[scanPattern: 'node/capsule/build/libs/corda*.jar']], - iqStage: params.nexusIqStage - ) - } - } - } - stage('All Tests') { parallel { stage('Another agent') { diff --git a/.ci/dev/publish-branch/Jenkinsfile.nightly b/.ci/dev/publish-branch/Jenkinsfile.nightly index b915590679..8c1f1ff637 100644 --- a/.ci/dev/publish-branch/Jenkinsfile.nightly +++ b/.ci/dev/publish-branch/Jenkinsfile.nightly @@ -14,25 +14,6 @@ import static com.r3.build.BuildControl.killAllExistingBuildsForJob killAllExistingBuildsForJob(env.JOB_NAME, env.BUILD_NUMBER.toInteger()) -/* -** calculate the stage for NexusIQ evaluation -** * build for snapshots -*/ -def nexusDefaultIqStage = "build" - -/** - * make sure calculated default value of NexusIQ stage is first in the list - * thus making it default for the `choice` parameter - */ -def nexusIqStageChoices = [nexusDefaultIqStage].plus( - [ - 'develop', - 'build', - 'stage-release', - 'release', - 'operate' - ].minus([nexusDefaultIqStage])) - pipeline { agent { label 'standard' } @@ -44,10 +25,6 @@ pipeline { buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14')) } - parameters { - choice choices: nexusIqStageChoices, description: 'NexusIQ stage for code evaluation', name: 'nexusIqStage' - } - triggers { cron '@midnight' } @@ -61,27 +38,6 @@ pipeline { } stages { - stage('Sonatype Check') { - steps { - authenticateGradleWrapper() - sh "./gradlew --no-daemon clean jar" - script { - sh "./gradlew --no-daemon properties | grep -E '^(version|group):' >version-properties" - /* every build related to Corda X.Y (GA, RC, HC, patch or snapshot) uses the same NexusIQ application */ - def version = sh (returnStdout: true, script: "grep ^version: version-properties | sed -e 's/^version: \\([0-9]\\+\\(\\.[0-9]\\+\\)\\+\\).*\$/\\1/'").trim() - def groupId = sh (returnStdout: true, script: "grep ^group: version-properties | sed -e 's/^group: //'").trim() - def artifactId = 'corda' - nexusAppId = "${groupId}-${artifactId}-${version}" - } - nexusPolicyEvaluation ( - failBuildOnNetworkError: false, - iqApplication: selectedApplication(nexusAppId), // application *has* to exist before a build starts! - iqScanPatterns: [[scanPattern: 'node/capsule/build/libs/corda*.jar']], - iqStage: params.nexusIqStage - ) - } - } - stage('Publish to Artifactory') { steps { rtServer ( diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile index bfd5703628..02dc1a403d 100644 --- a/.ci/dev/regression/Jenkinsfile +++ b/.ci/dev/regression/Jenkinsfile @@ -31,7 +31,7 @@ String COMMON_GRADLE_PARAMS = [ ].join(' ') pipeline { - agent { label 'standard-latest-ami' } + agent { label 'standard' } /* * List options in alphabetical order