X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Frelease-job.sh;h=5b163c89e06aff2342260110302f09877992c2e3;hb=729b2e3535f009a146719df7d7b52e036b2505cb;hp=e545ecac43c0933b8ac82150ebdb4bc53339802b;hpb=1c00d29b81fd8ae07206987f8994ac36eb0e6b1c;p=releng%2Fglobal-jjb.git

diff --git a/shell/release-job.sh b/shell/release-job.sh
index e545ecac..5b163c89 100644
--- 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"
@@ -98,13 +98,20 @@ for release_file in $release_files; do
     git merge --ff-only FETCH_HEAD
     git tag -am "$PROJECT $VERSION" "$VERSION"
     sigul --batch -c "$SIGUL_CONFIG" sign-git-tag "$SIGUL_KEY" "$VERSION" < "$SIGUL_PASSWORD"
+
     echo "Showing latest signature for $PROJECT:"
-    git log --show-signature -n1
+    gpg --import /tmp/onap-pubkey
+    echo "git tag -v "$VERSION""
+    git tag -v "$VERSION"
 
 
     ########## 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