From dc9da1d5bf8d1fb3f480988ae35f267c61fa8294 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Fri, 30 Oct 2020 13:42:36 +0100 Subject: [PATCH] Use OSSRH token credentials in workflow Closes gh-1725 --- .../continuous-integration-workflow.yml | 8 +- Jenkinsfile | 143 ------------------ 2 files changed, 4 insertions(+), 147 deletions(-) delete mode 100644 Jenkinsfile diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index bb45c45f..4432fefc 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -56,13 +56,13 @@ jobs: export VERSION_HEADER=$'Version: GnuPG v2\n\n' export ORG_GRADLE_PROJECT_signingKey=${GPG_PRIVATE_KEY#"$VERSION_HEADER"} export ORG_GRADLE_PROJECT_signingPassword="$GPG_PASSPHRASE" - ./gradlew deployArtifacts -PossrhUsername="$OSSRH_USERNAME" -PossrhPassword="$OSSRH_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace --no-parallel - ./gradlew finalizeDeployArtifacts -PossrhUsername="$OSSRH_USERNAME" -PossrhPassword="$OSSRH_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace --no-parallel + ./gradlew deployArtifacts -PossrhUsername="OSSRH_TOKEN_USERNAME" -PossrhPassword="OSSRH_TOKEN_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace --no-parallel + ./gradlew finalizeDeployArtifacts -PossrhUsername="OSSRH_TOKEN_USERNAME" -PossrhPassword="OSSRH_TOKEN_PASSWORD" -PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD" --stacktrace --no-parallel env: GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} - OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_TOKEN_USERNAME }} + OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_TOKEN_PASSWORD }} ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} docs: diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index ecfe3c30..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,143 +0,0 @@ -properties([ - buildDiscarder(logRotator(numToKeepStr: '10')), - pipelineTriggers([ - cron('@daily') - ]), -]) - -def SUCCESS = hudson.model.Result.SUCCESS.toString() -currentBuild.result = SUCCESS - -try { - parallel check: { - stage('Check') { - timeout(time: 45, unit: 'MINUTES') { - node('linux') { - label 'spring-session' - checkout scm - sh "git clean -dfx" - try { - withEnv(["JAVA_HOME=${tool 'jdk8'}"]) { - sh './gradlew clean check --no-daemon --stacktrace' - } - } - catch (e) { - currentBuild.result = 'FAILED: check' - throw e - } - finally { - junit '**/build/test-results/*/*.xml' - } - } - } - } - }, - jdk11: { - stage('JDK 11') { - timeout(time: 45, unit: 'MINUTES') { - node('linux') { - checkout scm - sh "git clean -dfx" - try { - withEnv(["JAVA_HOME=${tool 'jdk11'}"]) { - sh './gradlew clean test integrationTest --no-daemon --stacktrace' - } - } - catch (e) { - currentBuild.result = 'FAILED: jdk11' - throw e - } - } - } - } - }, - jdk12: { - stage('JDK 12') { - timeout(time: 45, unit: 'MINUTES') { - node('linux') { - checkout scm - try { - withEnv(["JAVA_HOME=${tool 'openjdk12'}"]) { - sh './gradlew clean test integrationTest --no-daemon --stacktrace' - } - } - catch (e) { - currentBuild.result = 'FAILED: jdk12' - throw e - } - } - } - } - } - - if (currentBuild.result == 'SUCCESS') { - parallel artifacts: { - stage('Deploy Artifacts') { - node('linux') { - checkout scm - sh "git clean -dfx" - try { - 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')]) { - withEnv(["JAVA_HOME=${tool 'jdk8'}"]) { - sh './gradlew deployArtifacts --no-daemon --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD' - sh './gradlew finalizeDeployArtifacts --no-daemon --stacktrace -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD' - } - } - } - } - } - } - catch (e) { - currentBuild.result = 'FAILED: artifacts' - throw e - } - } - } - }, - docs: { - stage('Deploy Docs') { - node('linux') { - checkout scm - sh "git clean -dfx" - try { - withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) { - withEnv(["JAVA_HOME=${tool 'jdk8'}"]) { - sh './gradlew deployDocs --no-daemon --stacktrace -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME' - } - } - } - catch (e) { - currentBuild.result = 'FAILED: docs' - throw e - } - } - } - } - } -} -finally { - def buildStatus = currentBuild.result - def buildNotSuccess = !SUCCESS.equals(buildStatus) - def lastBuildNotSuccess = !SUCCESS.equals(currentBuild.previousBuild?.result) - - if (buildNotSuccess || lastBuildNotSuccess) { - stage('Notify') { - node { - final def RECIPIENTS = [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']] - - def subject = "${buildStatus}: Build ${env.JOB_NAME} ${env.BUILD_NUMBER} status is now ${buildStatus}" - def details = "The build status changed to ${buildStatus}. For details see ${env.BUILD_URL}" - - emailext( - subject: subject, - body: details, - recipientProviders: RECIPIENTS, - to: "$SPRING_SESSION_TEAM_EMAILS" - ) - } - } - } -}