From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Wed, 30 Mar 2016 16:57:07 +0000 (-0400)
Subject: Stop leaving staging repos in open state
X-Git-Tag: release/beryllium-sr2~83
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F02%2F36902%2F2;p=releng%2Fbuilder.git

Stop leaving staging repos in open state

We're going to submit gpg signatures in a separate staging repository.
This will allow us to not use the workaround with Nginx.

Change-Id: Icfe3768eaa93fb6e3cd30b29f22d3da461c8e955
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
index 50fa109b91..38c8d798ae 100644
--- a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
+++ b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
@@ -9,7 +9,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-NEXUSURL=https://nexus.opendaylight.org/staged-repos/
+NEXUSURL=https://nexus.opendaylight.org/content/repositories/
 VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
 if [ "x${VERSION}" == "x" ]; then
     echo "Lithium or sooner, different path needs to be searched."
diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index 96f0da1a4a..4cda45ad55 100644
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -9,15 +9,6 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-# Job will pass in a variable ${DATESTAMP} if this variable is false than we
-# we are likely releasing a release candidate. We should skip closing the
-# Nexus staging repository so that we can sign the artifacts.
-SKIP_STAGING_CLOSE=false
-if [ "${DATESTAMP}" == "false" ]
-then
-    SKIP_STAGING_CLOSE=true
-fi
-
 # Assuming that mvn deploy created the hide/from/pom/files/stage directory.
 cd hide/from/pom/files
 mkdir -p m2repo/org/opendaylight/
@@ -39,7 +30,6 @@ rsync -avz --exclude 'maven-metadata*' \
            "stage/org/opendaylight/integration" m2repo/org/opendaylight/
 
 mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
-    -DskipStagingRepositoryClose=${SKIP_STAGING_CLOSE} \
     -DrepositoryDirectory="`pwd`/m2repo" \
     -DnexusUrl=http://nexus.opendaylight.org/ \
     -DstagingProfileId="425e43800fea70" \