Fix Java related issues

[releng/builder.git] / jjb / autorelease / include-raw-autorelease-get-integration-test-variables.sh

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 a4b6deb6c8836aa4c183c7860a6a4a706133452a..38c8d798ae5d5af025909937ea1269f1c5e0e6a5 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,8 +9,14 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-NEXUSURL=http://nexus.opendaylight.org/content/repositories/
+NEXUSURL=https://nexus.opendaylight.org/content/repositories/
 VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
-REPOID=`grep "Closing staging repository with ID" $WORKSPACE/deploy-staged-repository.log | cut -d '"' -f2`
+if [ "x${VERSION}" == "x" ]; then
+    echo "Lithium or sooner, different path needs to be searched."
+    VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distributions/karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
+fi
+echo "VERSION: ${VERSION}"
+REPOID=`grep "Created staging repository with ID" $WORKSPACE/deploy-staged-repository.log | cut -d '"' -f2`
 
 echo BUNDLEURL=${NEXUSURL}/${REPOID}/org/opendaylight/integration/distribution-karaf/${VERSION}/distribution-karaf-${VERSION}.zip > $WORKSPACE/variables.prop
+echo "BUNDLEURL: ${BUNDLEURL}"