[10.0.x] NO-ISSUE: Release jobs adjustments for the Apache 10 release (…

…#2556)
apache · Sep 18, 2024 · 3514977 · 3514977
1 parent 56a0497
commit 3514977
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 398 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.daily-dev-publish b/.ci/jenkins/Jenkinsfile.daily-dev-publish
@@ -596,7 +596,7 @@ pipeline {
             steps {
                 dir('kie-tools') {
                     script {
-                        withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployRepositoryCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
+                        withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeploySnapshotsCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
                             configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) {
                                 sh """#!/bin/bash -el
                                 export KIE_TOOLS_BUILD__mavenDeploySkip=false

diff --git a/.ci/jenkins/Jenkinsfile.weekly-publish b/.ci/jenkins/Jenkinsfile.weekly-publish
@@ -115,7 +115,7 @@ pipeline {
             steps {
                 dir('kie-tools') {
                     script {
-                        withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployRepositoryCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
+                        withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeploySnapshotsCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
                             configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) {
                                 timestampedSnapshotVersion = getTimestampedSnapshotVersion()
                                 sh """#!/bin/bash -el

diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui b/.ci/jenkins/release-jobs/Jenkinsfile.jbpm-quarkus-devui
@@ -118,7 +118,7 @@ pipeline {
                         if (params.DRY_RUN) {
                             env.KIE_TOOLS_BUILD__mavenDeploySkip = 'true'
                         }
-                        withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployRepositoryCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
+                        withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployStagingCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
                             configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) {
                                 sh """#!/bin/bash -el
                                 pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -e "\n--settings=${MAVEN_SETTINGS_FILE}" >> .mvn/maven.config'

diff --git a/.ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui b/.ci/jenkins/release-jobs/Jenkinsfile.sonataflow-quarkus-devui
@@ -118,7 +118,7 @@ pipeline {
                         if (params.DRY_RUN) {
                             env.KIE_TOOLS_BUILD__mavenDeploySkip = 'true'
                         }
-                        withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployRepositoryCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
+                        withCredentials([usernamePassword(credentialsId: "${pipelineVars.mavenDeployStagingCredentialsId}", usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) {
                             configFileProvider([configFile(fileId: "${pipelineVars.mavenSettingsConfigFileId}", variable: 'MAVEN_SETTINGS_FILE')]) {
                                 sh """#!/bin/bash -el
                                 pnpm ${env.PNPM_FILTER_STRING} exec 'bash' '-c' 'echo -e "\n--settings=${MAVEN_SETTINGS_FILE}" >> .mvn/maven.config'

diff --git a/.ci/jenkins/shared-scripts/pipelineVars.groovy b/.ci/jenkins/shared-scripts/pipelineVars.groovy
@@ -36,11 +36,12 @@ class PipelineVars implements Serializable {
     String asfGithubPushCredentialsId = '84811880-2025-45b6-a44c-2f33bef30ad2'
     String asfGithubTokenPushCredentialsId = '41128c14-bb63-4708-9074-d20a318ee630'
     String mavenSettingsConfigFileId = 'kie-release-settings'
-    String mavenDeployRepositoryCredentialsId = 'apache-nexus-kie-deploy-credentials'
+    String mavenDeploySnapshotsCredentialsId = 'apache-nexus-kie-deploy-credentials'
+    String mavenDeployStagingCredentialsId = 'jenkins-deploy-to-nexus-staging'
     String defaultArtifactsTempDir = 'artifacts-tmp'
     String asfReleaseStagingRepository = 'https://dist.apache.org/repos/dist/dev/incubator/kie'
-    String asfReleaseGPGKeyCredentialsId = 'GPG_KEY'
-    String asfReleaseSVNStagingCredentialsId = 'kie-dist-acct'
+    String asfReleaseGPGKeyCredentialsId = 'GPG_KEY_FILE'
+    String asfReleaseSVNStagingCredentialsId = 'kie-svn-credentials'
     String kieToolsCiBuildImageRegistry = 'docker.io'
     String kieToolsCiBuildImageAccount = 'apache'
     String kieToolsCiBuildImageName = 'incubator-kie-tools-ci-build'

diff --git a/.ci/jenkins/shared-scripts/releaseUtils.groovy b/.ci/jenkins/shared-scripts/releaseUtils.groovy
@@ -21,10 +21,8 @@
 def setupSigningKey(String gpgKeyCredentialsId) {
     withCredentials([file(credentialsId: gpgKeyCredentialsId, variable: 'SIGNING_KEY')]) {
         sh """#!/bin/bash -el
-        echo "${SIGNING_KEY}" > ${WORKSPACE}/signkey.gpg
         gpg --list-keys
-        gpg --batch --pinentry-mode loopback --import ${WORKSPACE}/signkey.gpg
-        rm ${WORKSPACE}/signkey.gpg
+        gpg --batch --pinentry-mode=loopback --import $SIGNING_KEY
         """.trim()
     }
 }
@@ -45,10 +43,10 @@ def signArtifact(String artifactFileName) {
 def publishArtifacts(String artifactsDir, String releaseRepository, String releaseVersion, String credentialsId) {
     withCredentials([usernamePassword(credentialsId: credentialsId, usernameVariable: 'ASF_USERNAME', passwordVariable: 'ASF_PASSWORD')]) {
         sh """#!/bin/bash -el
-        svn co --depth=empty ${releaseRepository} svn-kie
-        cp ${artifactsDir}/* svn-kie/${releaseVersion}/
-        svn add "svn-kie/${releaseVersion}"
+        svn co --depth=empty ${releaseRepository}/${releaseVersion} svn-kie
+        cp ${artifactsDir}/* svn-kie
         cd svn-kie
+        svn add . --force
         svn ci --non-interactive --no-auth-cache --username ${ASF_USERNAME} --password '${ASF_PASSWORD}' -m "Apache KIE ${releaseVersion} artifacts"
         rm -rf svn-kie
         """.trim()