Merge pull request #87 from olblak/master

Move PROMOTE_STAGING_MAVEN_ARTIFACTS_ARGS default declaration position

Author: olblak

README.adoc

@@ -404,6 +404,20 @@ Show pkcs12 information
 
 More information about Jenkins Core maintainers and the different roles can be found in https://github.com/jenkinsci/jenkins/blob/master/docs/MAINTAINERS.adoc[MAINTAINERS].
 
+== FAQ
+
+**The stage release failed and we already push commits during the maven release.**
+
+The problem here, is if we re-trigger the release job, we also update the release version again.
+So if the process fails on running  `mvn release:stage`, then we can re-trigger it from inside the container as custom parameters are located in `settings-release.xml`.
+
+```
+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
+```
+
 == Miscellaneous
 
 * Jenkins docker images are describe from https://github.com/jenkinsci/docker[jenkinsci/docker] repository and deployed to DockerHub as link:https://hub.docker.com/r/jenkins/jenkins[jenkins/jenkins]

utils/release.sh

@@ -43,11 +43,6 @@ source ""$(dirname "$(dirname "$0")")"/profile.d/$RELEASE_PROFILE"
 : "${RELEASE_GIT_STAGING_BRANCH:=$RELEASE_GIT_BRANCH}"
 : "${RELEASE_GIT_PRODUCTION_REPOSITORY:=$RELEASE_GIT_REPOSITORY }"
 : "${RELEASE_GIT_PRODUCTION_BRANCH:=$RELEASE_GIT_BRANCH}"
-# Following line will copy every items from source to destination,
-# keeps in mind that it won't delete from source and override on destination if already exist!.
-# It's wise to disable delete permission on destination repository
-# as explained here https://www.jfrog.com/confluence/display/JFROG/Permissions#Permissions-RepositoryPermissions
-: "${PROMOTE_STAGING_MAVEN_ARTIFACTS_ARGS:=item --mode copy --source $MAVEN_REPOSITORY_NAME --destination $MAVEN_REPOSITORY_PRODUCTION_NAME --url $MAVEN_REPOSITORY_URL --username $MAVEN_REPOSITORY_USERNAME --password $MAVEN_REPOSITORY_PASSWORD --search '/org/jenkins-ci/main' $(./utils/getJenkinsVersion.py --version)}"
 
 export JENKINS_VERSION
 export JENKINS_DOWNLOAD_URL
@@ -62,6 +57,12 @@ export CREDENTIAL
 export GPG_PASSPHRASE_FILE
 export GPG_KEYNAME
 
+# Following line will copy every items from source to destination,
+# keeps in mind that it won't delete from source and override on destination if already exist!.
+# It's wise to disable delete permission on destination repository
+# as explained here https://www.jfrog.com/confluence/display/JFROG/Permissions#Permissions-RepositoryPermissions
+: "${PROMOTE_STAGING_MAVEN_ARTIFACTS_ARGS:=item --mode copy --source $MAVEN_REPOSITORY_NAME --destination $MAVEN_REPOSITORY_PRODUCTION_NAME --url $MAVEN_REPOSITORY_URL --username $MAVEN_REPOSITORY_USERNAME --password $MAVEN_REPOSITORY_PASSWORD --search '/org/jenkins-ci/main' $(./utils/getJenkinsVersion.py --version)}"
+
 if [ ! -d "$WORKING_DIRECTORY" ]; then
   mkdir -p "$WORKING_DIRECTORY"
 fi