From: Anil Belur Date: Mon, 3 Apr 2017 02:36:09 +0000 (+0000) Subject: Merge "Make tox/python jobs use 4g builder" X-Git-Tag: release/carbon~198 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=052c78f537806c396d05f0d2d5ad930b48cd839a;hp=30d20f8bdf62cfd861b28a29690c74b81b2c9f96;p=releng%2Fbuilder.git 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 ae172ad36..2455e6d42 100644 --- 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 bad2f7583..f7afd65d9 100644 --- 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 bc525171f..0b7a05ae6 100644 --- 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 5dd16bb0d..dc95c8e4e 100644 --- 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 bd74574da..e57c254bc 100644 --- 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 ae190704d..bb411f54e 100644 --- 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 6a9acf8d0..36443f389 100755 --- 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 " 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" \