Bug 1251511 - update verify override some variables r=Callek
authorRail Aliiev <rail@mozilla.com>
Thu, 25 Feb 2016 23:15:04 -0800
changeset 6584 fe0f77b7618a47dc848dfc2d83a73f1468d9bc83
parent 6583 c6f0438b5cd82aaa50a07dc11f3b7352be3218be
child 6585 95a1ee0c74b7ac8b106822579bd831cf8a125506
push id24
push userjlund@mozilla.com
push dateThu, 03 Mar 2016 01:09:31 +0000
reviewersCallek
bugs1251511
Bug 1251511 - update verify override some variables r=Callek MozReview-Commit-ID: CBj7jONhwye
scripts/release/updates/chunked-verify.sh
--- a/scripts/release/updates/chunked-verify.sh
+++ b/scripts/release/updates/chunked-verify.sh
@@ -14,38 +14,41 @@ fi
 JSONTOOL="$PYTHON $SCRIPTS_DIR/buildfarm/utils/jsontool.py"
 workdir=`pwd`
 
 platform=$1
 configDict=$2
 chunks=$3
 thisChunk=$4
 channel=$5
-if $JSONTOOL -k properties.NO_BBCONFIG $PROPERTIES_FILE; then
-   NO_BBCONFIG=$($JSONTOOL -k properties.NO_BBCONFIG $PROPERTIES_FILE);
-fi;
-if [ -z "$NO_BBCONFIG" -a -z "$BUILDBOT_CONFIGS" ]; then
-    export BUILDBOT_CONFIGS="https://hg.mozilla.org/build/buildbot-configs"
-fi
+
 if [ -n "$PROPERTIES_FILE" -a -f "$PROPERTIES_FILE" ]; then
+    # Buildbot only
+    if $JSONTOOL -k properties.NO_BBCONFIG $PROPERTIES_FILE; then
+       NO_BBCONFIG=$($JSONTOOL -k properties.NO_BBCONFIG $PROPERTIES_FILE);
+    fi
+    if $JSONTOOL -k properties.VERIFY_CONFIG $PROPERTIES_FILE; then
+       VERIFY_CONFIG=$($JSONTOOL -k properties.VERIFY_CONFIG $PROPERTIES_FILE);
+    fi
+    if [ -z "$NO_BBCONFIG" -a -z "$BUILDBOT_CONFIGS" ]; then
+        export BUILDBOT_CONFIGS="https://hg.mozilla.org/build/buildbot-configs"
+    fi
     # Get the assumed slavebuilddir, and read in from buildbot if this is not
     # Release promotion
     SLAVEBUILDDIR=$(basename $(cd "$SCRIPTS_DIR/.."; pwd))
     if [ -z "$NO_BBCONFIG" ]; then
         RELEASE_CONFIG=$($JSONTOOL -k properties.release_config $PROPERTIES_FILE)
         TAG=$($JSONTOOL -k properties.release_tag $PROPERTIES_FILE)
         SLAVEBUILDDIR=$($JSONTOOL -k properties.slavebuilddir $PROPERTIES_FILE)
     fi
 
     $PYTHON -u $SCRIPTS_DIR/buildfarm/maintenance/purge_builds.py \
         -s 16 -n info -n 'rel-*' -n 'tb-rel-*' -n $SLAVEBUILDDIR
 fi
-if $JSONTOOL -k properties.VERIFY_CONFIG $PROPERTIES_FILE; then
-   VERIFY_CONFIG=$($JSONTOOL -k properties.VERIFY_CONFIG $PROPERTIES_FILE);
-fi;
+
 if [ -z "$VERIFY_CONFIG" -a -n "$NO_BBCONFIG" ]; then
     echo "Unable to run without VERIFY_CONFIG specified when using NO_BBCONFIG"
     exit 1
 fi
 
 if [ -z "$NO_BBCONFIG" ]; then
   $PYTHON $MY_DIR/chunked-verify.py -t $TAG -r $RELEASE_CONFIG \
   -b $BUILDBOT_CONFIGS -p $platform --chunks $chunks --this-chunk $thisChunk \