Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dead arguments code #291

Merged
merged 1 commit into from
Sep 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
48 changes: 4 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 @@ -350,15 +342,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 +407,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