diff --git a/Jenkinsfile b/Jenkinsfile index 28db3464..e1366760 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,13 +1,14 @@ +def p = [:] + +node { + checkout scm + p = readProperties interpolate: true, file: 'ci/pipeline.properties' +} + pipeline { agent any -/* - environment { - JAVA_HOME = "${tool 'jdk8'}" - } - */ - options { buildDiscarder(logRotator(numToKeepStr: '15')) disableConcurrentBuilds() @@ -20,16 +21,13 @@ pipeline { stages { stage('Build') { - environment { - DOCKER_HUB = credentials('hub.docker.com-springbuildmaster') - } options { timeout(time: 15, unit: "MINUTES") } steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('eclipse-temurin:17.0.1_12-jdk').inside('-u root -v /usr/bin/docker:/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock -v /tmp:/tmp') { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { + docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.full']) { sh "echo 'Setup build environment...'" sh "ci/setup.sh" @@ -66,8 +64,8 @@ pipeline { } steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('eclipse-temurin:17.0.1_12-jdk').inside("--name ${env.HOSTNAME}Two -u root -v /tmp:/tmp") { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { + docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.basic']) { withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { try { sh "ci/deployDocs.sh" @@ -89,12 +87,12 @@ pipeline { } steps { script { - docker.withRegistry('', 'hub.docker.com-springbuildmaster') { - docker.image('eclipse-temurin:17.0.1_12-jdk').inside("--name ${env.HOSTNAME}One -u root -v /tmp:/tmp") { + docker.withRegistry(p['docker.registry'], p['docker.credentials']) { + docker.image(p['docker.container.image.java.main']).inside(p['docker.container.inside.env.basic']) { withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) { withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) { - withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) { - withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { + withCredentials([usernamePassword(credentialsId: 'oss-token', usernameVariable: 'OSSRH_USERNAME', passwordVariable: 'OSSRH_PASSWORD')]) { + withCredentials([usernamePassword(credentialsId: p['artifactory.credentials'], usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) { try { sh "ci/deployArtifacts.sh" } diff --git a/ci/check.sh b/ci/check.sh index d9f1cdfc..1e04b0d9 100755 --- a/ci/check.sh +++ b/ci/check.sh @@ -2,5 +2,5 @@ set -eou pipefail -GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp" \ +GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Djava.io.tmpdir=/tmp" \ ./gradlew clean check --no-daemon --refresh-dependencies --stacktrace diff --git a/ci/deployArtifacts.sh b/ci/deployArtifacts.sh index 06961d6d..408465cc 100755 --- a/ci/deployArtifacts.sh +++ b/ci/deployArtifacts.sh @@ -9,7 +9,7 @@ echo "Deploying artifacts on host [$HOSTNAME]" # Syntax: `chown -R userId:groupId .` chown -R 1001:1001 . -GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp" \ +GRADLE_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Djava.io.tmpdir=/tmp" \ ./gradlew publishArtifacts releasePublishedArtifacts --no-build-cache --no-configuration-cache --no-daemon --stacktrace \ -PartifactoryUsername=$ARTIFACTORY_USERNAME \ -PartifactoryPassword=$ARTIFACTORY_PASSWORD \ diff --git a/ci/deployDocs.sh b/ci/deployDocs.sh index 7368dd8a..46bb8659 100755 --- a/ci/deployDocs.sh +++ b/ci/deployDocs.sh @@ -9,7 +9,7 @@ echo "Deploying docs on host [$HOSTNAME]" # Syntax: `chown -R userId:groupId .` chown -R 1001:1001 . -GRADLE_OPTS="--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED -Duser.name=jenkins -Djava.io.tmpdir=/tmp" \ +GRADLE_OPTS="--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED -Duser.name=jenkins -Duser.home=/tmp/jenkins-home -Djava.io.tmpdir=/tmp" \ ./gradlew deployDocs --no-daemon --stacktrace \ -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY \ -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME diff --git a/ci/pipeline.properties b/ci/pipeline.properties new file mode 100644 index 00000000..211e6eeb --- /dev/null +++ b/ci/pipeline.properties @@ -0,0 +1,14 @@ +# Java (JDK) versions +java.main.tag=17.0.2_8-jdk + +# Docker Container Images +docker.container.image.java.main=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag} + +# Docker Environment Settings +docker.container.inside.env.basic=-u root -v $HOME:/tmp/jenkins-home -v /tmp:/tmp +docker.container.inside.env.full=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /tmp:/tmp -v $HOME:/tmp/jenkins-home + +# Credentials +docker.registry= +docker.credentials=hub.docker.com-springbuildmaster +artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c