Merge "Make tox/python jobs use 4g builder"

diff --git a/jjb/integration/include-raw-integration-compare-distributions.sh b/jjb/integration/include-raw-integration-compare-distributions.sh
index ae172ad368ae3a452f72661455fe39092506a36b..2455e6d426027755706c2537868651ff57321a10 100644 (file)
--- a/jjb/integration/include-raw-integration-compare-distributions.sh
+++ b/jjb/integration/include-raw-integration-compare-distributions.sh
@@ -5,7 +5,7 @@
 # Do not fail the build if there is trouble trying to collect distribution patch diffs
 set +e
 
-wget --progress=dot:mega $ACTUALBUNDLEURL
+wget --no-verbose --show-progress --progress=dot:giga $ACTUALBUNDLEURL
 echo "Extracting the last distribution found on nexus..."
 unzip -q $BUNDLE
 mv $BUNDLEFOLDER /tmp/distro_old

diff --git a/jjb/integration/include-raw-integration-configure-clustering.sh b/jjb/integration/include-raw-integration-configure-clustering.sh
index bad2f75833d219269c2d61b4ac596777a638a717..f7afd65d90eaffcde87131e3afbc5c9f7f1b9e43 100644 (file)
--- a/jjb/integration/include-raw-integration-configure-clustering.sh
+++ b/jjb/integration/include-raw-integration-configure-clustering.sh
@@ -64,7 +64,7 @@ echo "Changing to /tmp"
 cd /tmp
 
 echo "Downloading the distribution from ${ACTUALBUNDLEURL}"
-wget --progress=dot:mega  '${ACTUALBUNDLEURL}'
+wget --no-verbose --show-progress --progress=dot:giga '${ACTUALBUNDLEURL}'
 
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}

diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
index bc525171f46ffeafdce86692d40a613eec67ccf6..0b7a05ae6d1fb517ae1bc29f97dce29102b9b75f 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
@@ -8,7 +8,7 @@ echo "Clean workspace"
 rm -rf *
 
 echo "Downloading the distribution..."
-wget --progress=dot:mega ${ACTUALBUNDLEURL}
+wget --no-verbose --show-progress --progress=dot:giga ${ACTUALBUNDLEURL}
 
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 5dd16bb0d5211ac09cb1efe3f21d1da6bd3f51cc..dc95c8e4edba7c905cfb249e719a43a533e53694 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -43,7 +43,7 @@ echo "Changing to /tmp"
 cd /tmp
 
 echo "Downloading the distribution..."
-wget --progress=dot:mega '${ACTUALBUNDLEURL}'
+wget --no-verbose --show-progress --progress=dot:giga '${ACTUALBUNDLEURL}'
 
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}

diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
index bd74574dabdb29540cc0fa8a5a0b90a8ef019e61..e57c254bca304a7bf05e1432d35d8246f993b414 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
@@ -8,7 +8,7 @@ echo "Clean workspace"
 rm -rf *
 
 echo "Downloading the distribution..."
-wget --progress=dot:mega  ${ACTUALBUNDLEURL}
+wget --no-verbose --show-progress --progress=dot:giga ${ACTUALBUNDLEURL}
 
 echo "Extracting the new controller..."
 unzip -q ${BUNDLE}

diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh
index ae190704da87856fb134395bf516ef175d378638..bb411f54e44943bab51cbf96e4e782bfebc14120 100644 (file)
--- a/jjb/opendaylight-infra-stack.sh
+++ b/jjb/opendaylight-infra-stack.sh
@@ -22,7 +22,6 @@ echo "Trying up to $STACK_RETRIES times to create $STACK_NAME."
 for try in $(seq $STACK_RETRIES); do
     # shellcheck disable=SC1083
     openstack stack create --timeout "$OS_TIMEOUT" -t {stack-template} -e "$WORKSPACE/opendaylight-infra-environment.yaml" --parameter "job_name=$VM_NAME" --parameter "silo=$SILO" "$STACK_NAME"
-    openstack stack list
     echo "$try: Waiting for $OS_TIMEOUT minutes to create $STACK_NAME."
     for i in $(seq $OS_TIMEOUT); do
         sleep 60
@@ -37,7 +36,6 @@ for try in $(seq $STACK_RETRIES); do
             ;;
             CREATE_FAILED)
                 echo "ERROR: Failed to initialize infrastructure. Deleting stack and possibly retrying to create..."
-                openstack stack list
                 openstack stack delete --yes "$STACK_NAME"
                 openstack stack show "$STACK_NAME"
                 # after stack delete, poll for 10m to know when stack is fully removed

diff --git a/scripts/odlsign-bulk b/scripts/odlsign-bulk
index 6a9acf8d0dfc4dc698f0c2ff1fe3d8b4653f4160..36443f38942506d1cc371a3019bfb9499cfd6904 100755 (executable)
--- a/scripts/odlsign-bulk
+++ b/scripts/odlsign-bulk
@@ -10,6 +10,9 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
+# Force any errors to cause the script to end with failure
+set -eu -o pipefail
+
 function print_usage {
     echo "Usage: $0 <staging-repo>"
     echo ""
@@ -39,7 +42,8 @@ if [ -d "$SIGNATURES_DIR" ]; then
 fi
 mkdir $SIGNATURES_DIR
 
-mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.7:deploy-staged-repository \
+mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8:deploy-staged-repository \
+    -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
     -DskipStagingRepositoryClose=true \
     -DrepositoryDirectory="$SIGNATURES_DIR" \
     -DnexusUrl=https://nexus.opendaylight.org/ \
@@ -47,7 +51,7 @@ mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.7:deploy-staged-reposito
     -DserverId="opendaylight.staging" | tee /tmp/deploy-staged-repository.log
 
 STAGED_REPO_ID=`grep 'Created staging repository with ID' /tmp/deploy-staged-repository.log | sed -e 's/.*ID "//' -e 's/".*//'`
-echo "Staged Repo: $STAGED_REPO"
+echo "Staged Repo: $STAGED_REPO_ID"
 
 #
 # Finally retrieve and sign artifacts.
@@ -57,7 +61,8 @@ for i in $PROJECTS
 do
     echo "Signing $i"
     ./odlrelease sign http://nexus.opendaylight.org/content/repositories/$SIGNREPO/org/opendaylight/$i/
-    mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.7:deploy-staged-repository \
+    mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8:deploy-staged-repository \
+        -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
         -DskipStagingRepositoryClose=true \
         -DstagingRepositoryId=$STAGED_REPO_ID \
         -DrepositoryDirectory="$SIGNATURES_DIR" \