Skip to content

Commit

Permalink
[JENKINS-69666] Core Release: Staging not working anymore (#298)
Browse files Browse the repository at this point in the history
Remove dead arguments code (cherry picked from commit 4a61824)
Add `sign` to `<activeProfiles>` (cherry picked from commit 43a9681)
  • Loading branch information
basil authored Sep 27, 2022
1 parent 2336036 commit 7794048
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 45 deletions.
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ So if the process fails on running `mvn release:stage`, then we can re-trigger
kubectl get pods -n release # Looking for the correct jenkins agent name
kubectl exec -i -t -n release -c maven <pod_name alias jenkins agent> bash
cd /home/jenkins/agent/workspace/core_release_master/release
mvn -B -DstagingRepository=releases::default::https://repo.jenkins-ci.org/releases -s settings-release.xml --no-transfer-progress -Darguments=--no-transfer-progress release:stage
mvn -B -DstagingRepository=releases::default::https://repo.jenkins-ci.org/releases -s settings-release.xml --no-transfer-progress release:stage
```

== Miscellaneous
Expand Down
49 changes: 5 additions & 44 deletions utils/release.bash
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,7 @@ function requireAzureKeyvaultCredentials(){
}

function clean(){

# Do not display transfer progress when downloading or uploading
# https://maven.apache.org/ref/3.6.1/maven-embedder/cli.html
# mvn -s settings-release.xml -B --no-transfer-progress -Darguments=--no-transfer-progress release:clean
# 2020-06-24: --no-transfer-progress doesn't seem to be fully suported in maven release plugin
# This workaround can be reverted once MRELEASE-1048 is fixed
# https://issues.apache.org/jira/browse/MRELEASE-1048

mvn -s settings-release.xml -B --no-transfer-progress -Darguments=-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn release:clean
mvn -s settings-release.xml -B --no-transfer-progress release:clean
}

function cloneReleaseGitRepository(){
Expand Down Expand Up @@ -230,6 +222,7 @@ cat <<EOT> settings-release.xml
</servers>
<activeProfiles>
<activeProfile>release</activeProfile>
<activeProfile>sign</activeProfile>
<activeProfile>automated-release</activeProfile>
</activeProfiles>
</settings>
Expand Down Expand Up @@ -350,15 +343,7 @@ function prepareRelease(){
generateSettingsXml
printf "\\n Prepare Jenkins Release\\n\\n"
# Do not display transfer progress when downloading or uploading
# https://maven.apache.org/ref/3.6.1/maven-embedder/cli.html
#mvn -B -s settings-release.xml --no-transfer-progress -Darguments=--no-transfer-progress release:prepare
# 2020-06-24: --no-transfer-progress doesn't seem to be fully suported in maven release plugin
# This workaround can be reverted once MRELEASE-1048 is fixed
# https://issues.apache.org/jira/browse/MRELEASE-1048
mvn -B -s settings-release.xml --no-transfer-progress -Darguments=-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn release:prepare
mvn -B -s settings-release.xml --no-transfer-progress release:prepare
}
function promoteStagingMavenArtifacts(){
Expand Down Expand Up @@ -423,47 +408,23 @@ function rollback(){
function stageRelease(){
requireGPGPassphrase
requireKeystorePass
printf "\\n Stage Jenkins Release\\n\\n"
# Do not display transfer progress when downloading or uploading
# https://maven.apache.org/ref/3.6.1/maven-embedder/cli.html
#mvn -B \
# "-DstagingRepository=${MAVEN_REPOSITORY_NAME}::default::${MAVEN_REPOSITORY_URL}/${MAVEN_REPOSITORY_NAME}" \
# -s settings-release.xml \
# --no-transfer-progress \
# -Darguments=--no-transfer-progress \
# release:stage
# 2020-06-24: --no-transfer-progress doesn't seem to be fully suported in maven release plugin
# This workaround can be reverted once MRELEASE-1048 is fixed
# https://issues.apache.org/jira/browse/MRELEASE-1048
mvn -V -B \
"-DstagingRepository=${MAVEN_REPOSITORY_NAME}::default::${MAVEN_REPOSITORY_URL}/${MAVEN_REPOSITORY_NAME}" \
-s settings-release.xml \
--no-transfer-progress \
-Darguments=-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
release:stage
}
function performRelease(){
requireGPGPassphrase
requireKeystorePass
printf "\\n Perform Jenkins Release\\n\\n"
# Do not display transfer progress when downloading or uploading
# https://maven.apache.org/ref/3.6.1/maven-embedder/cli.html
# mvn -B \
# -s settings-release.xml \
# --no-transfer-progress \
# -Darguments=--no-transfer-progress \
# release:perform
# 2020-06-24: --no-transfer-progress doesn't seem to be fully suported in maven release plugin
# This workaround can be reverted once MRELEASE-1048 is fixed
# https://issues.apache.org/jira/browse/MRELEASE-1048
mvn -B \
-s settings-release.xml \
--no-transfer-progress \
-Darguments=-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
release:perform
}
Expand Down

0 comments on commit 7794048

Please sign in to comment.