Allow staging repos to remain open again

This reverts commit d923faff8b1fc8a645f31076de013326b3117e00.

Found a solution that hopefully works allowing us to continue with the
automated integration job and allows us to keep the staging repo open
for GPG signing.

We're hosting the staging repos through a web backend to allow us to
access the staged repos while at the same time allow the repos to be in
Open state in Nexus.

This patch updates the download path for the artifacts needed by the
integration distribution job.

Change-Id: Ic1700d1cc8ffe0e89f94c56f4da0c7a6be84bea2
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 efbfab6a5bd87a20f0cf314401a3df1878d9fc4c..ff7cf11a3f5b7efc4e9691f8187cbd8ed430279e 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
+++ b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
 ##############################################################################
-# Copyright (c) 2015 The Linux Foundation and others.
+# Copyright (c) 2015, 2016 The Linux Foundation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
@@ -9,7 +9,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-NEXUSURL=http://nexus.opendaylight.org/content/repositories/
+NEXUSURL=https://nexus.opendaylight.org/staged-repos/
 VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
 REPOID=`grep "Created staging repository with ID" $WORKSPACE/deploy-staged-repository.log | cut -d '"' -f2`
 

diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index eb614b23b3dc9be556353f3fced9292e8c0a732a..8bf44222416baeb9048907f0aadb2d861a23e910 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -13,13 +13,10 @@
 # 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
-# TODO: Figure out a solution to Open staging repos not being available
-#       immediately. This means integration tests cannot reliably download and
-#       test the new build if we leave the staging repo open.
-# if [ "${DATESTAMP}" == "false" ]
-# then
-#     SKIP_STAGING_CLOSE=true
-# fi
+if [ "${DATESTAMP}" == "false" ]
+then
+    SKIP_STAGING_CLOSE=true
+fi
 
 mkdir -p hide/from/pom/files
 cd hide/from/pom/files