Merge "BUG-2625: validate snmp4sdn using jdk8 only"

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 41f344ff228b1df12d9983e20fd5819649488fbe..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
@@ -28,8 +25,7 @@ mkdir -p m2repo/org/opendaylight/
 (IFS='
 '
 for m in `xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' ../../../../pom.xml`; do
-    rsync -avz --exclude 'maven-metadata-local.xml' \
-               --exclude 'maven-metadata-*' \
+    rsync -avz --exclude 'maven-metadata*' \
                --exclude '_remote.repositories' \
                --exclude 'resolver-status.properties' \
                "/tmp/r/org/opendaylight/$m" m2repo/org/opendaylight/
@@ -37,8 +33,7 @@ done)
 
 # Add exception for integration project since they release under the
 # integration top-level project.
-rsync -avz --exclude 'maven-metadata-local.xml' \
-           --exclude 'maven-metadata-*' \
+rsync -avz --exclude 'maven-metadata*' \
            --exclude '_remote.repositories' \
            --exclude 'resolver-status.properties' \
            "/tmp/r/org/opendaylight/integration" m2repo/org/opendaylight/

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 8ce116a7faa95650a916c6ccc93a4bf57932f7b1..fdcf2ced3efbefcb83c57913968de7b447fdc67a 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -202,6 +202,7 @@
 
 - job-template:
     name: 'builder-weekly'
+    disabled: true
     node: jjbuilder
 
     # builder-weekly job to run JJB update weekly