diff --git a/.ci/dev/compatibility/JenkinsfileJDK11Compile b/.ci/dev/compatibility/JenkinsfileJDK11Compile index 4fea64e15a..549845dc5d 100644 --- a/.ci/dev/compatibility/JenkinsfileJDK11Compile +++ b/.ci/dev/compatibility/JenkinsfileJDK11Compile @@ -22,6 +22,13 @@ pipeline { buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14')) } + environment { + ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials') + CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}" + CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}" + CORDA_USE_CACHE = "corda-remotes" + } + stages { stage('JDK 11 Compile') { steps { diff --git a/.ci/dev/nightly-regression/Jenkinsfile b/.ci/dev/nightly-regression/Jenkinsfile index 108050932f..06266dcb23 100644 --- a/.ci/dev/nightly-regression/Jenkinsfile +++ b/.ci/dev/nightly-regression/Jenkinsfile @@ -44,6 +44,7 @@ pipeline { ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials') CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}" CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}" + CORDA_USE_CACHE = "corda-remotes" } stages { diff --git a/.ci/dev/pr-code-checks/Jenkinsfile b/.ci/dev/pr-code-checks/Jenkinsfile index 2ac3aef24a..ba89d0b85d 100644 --- a/.ci/dev/pr-code-checks/Jenkinsfile +++ b/.ci/dev/pr-code-checks/Jenkinsfile @@ -17,6 +17,10 @@ pipeline { environment { SNYK_API_TOKEN = credentials('c4-os-snyk-api-token-secret') C4_OS_SNYK_ORG_ID = credentials('c4-os-snyk-org-id') + ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials') + CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}" + CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}" + CORDA_USE_CACHE = "corda-remotes" } stages { diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile index 1c3b7ed64c..2b60731310 100644 --- a/.ci/dev/regression/Jenkinsfile +++ b/.ci/dev/regression/Jenkinsfile @@ -54,6 +54,7 @@ pipeline { ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials') CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}" CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}" + CORDA_USE_CACHE = "corda-remotes" DOCKER_URL = "https://index.docker.io/v1/" EMAIL_RECIPIENTS = credentials('corda4-email-recipient') SNYK_API_KEY = "c4-os-snyk" //Jenkins credential type: Snyk Api token @@ -280,7 +281,7 @@ pipeline { stage('Publish Release Candidate to Internal Repository') { when { - expression { isReleaseCandidate } + expression { return false} // keeping stage to preserve Jenkins history on release branches, but not supported for patch builds pre 4.9 } steps { withCredentials([ diff --git a/Jenkinsfile b/Jenkinsfile index b46d3647bd..0e8c951218 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,6 +47,7 @@ pipeline { ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials') CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}" CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}" + CORDA_USE_CACHE = "corda-remotes" } stages { diff --git a/docker/src/docker/Dockerfile b/docker/src/docker/Dockerfile index 84200d542b..c2607837dc 100644 --- a/docker/src/docker/Dockerfile +++ b/docker/src/docker/Dockerfile @@ -1,5 +1,8 @@ FROM azul/zulu-openjdk:8u312 +## Remove Azul Zulu repo, as it is gone by now +RUN rm /etc/apt/sources.list.d/zulu.list + ## Add packages, clean cache, create dirs, create corda user and change ownership RUN apt-get update && \ apt-mark hold zulu8-jdk && \