Merge "Self serve release docs"

[releng/global-jjb.git] / shell / release-job.sh

diff --git a/shell/release-job.sh b/shell/release-job.sh
index e545eca..783979a 100644 (file)
--- a/shell/release-job.sh
+++ b/shell/release-job.sh
@@ -37,7 +37,7 @@ fi
 NEXUS_URL="${NEXUSPROXY:-$NEXUS_URL}"
 
 # Fetch the release-schema.yaml
-wget -q https://github.com/lfit/releng-global-jjb/blob/master/schema/release-schema.yaml
+wget -q https://raw.githubusercontent.com/lfit/releng-global-jjb/master/schema/release-schema.yaml
 
 release_files=$(git diff HEAD^1 --name-only -- "releases/")
 echo "RELEASE FILES ARE AS FOLLOWS: $release_files"
@@ -69,7 +69,7 @@ for release_file in $release_files; do
         echo "LOGS_SERVER: $LOGS_SERVER"
         echo "NEXUS_URL: $NEXUS_URL"
         echo "NEXUS_PATH: $NEXUS_PATH"
-        echo "ODLNEXUSPROXY: $ODLNEXUSPROXY"
+        echo "NEXUSPROXY: $NEXUSPROXY"
         echo "JENKINS_HOSTNAME: $JENKINS_HOSTNAME"
         echo "SILO: $SILO"
         echo "PROJECT: $PROJECT"
@@ -105,6 +105,10 @@ for release_file in $release_files; do
     ########## Merge Part ##############
     if [[ "$JOB_NAME" =~ "merge" ]]; then
         echo "Running merge"
+        gerrit_ssh=$(echo "$GERRIT_URL" | awk -F"/" '{print $3}')
+        git remote set-url origin ssh://"$RELEASE_USERNAME"@"$gerrit_ssh":29418/$PROJECT
+        git config user.name "$RELEASE_USERNAME"
+        git config user.email "$RELEASE_EMAIL"
         git push origin "$VERSION"
         lftools nexus release --server "$NEXUS_URL" "$STAGING_REPO"
         if [ "${MAVEN_CENTRAL_URL}" == 'None' ]; then