Bug 444274 - Failed to publish I20140916-0800 build

9 files changed, 19 insertions, 21 deletions

diff --git a/production/gather-parts.sh b/production/gather-parts.sh
index 98fb760f0..d95b0f0bd 100644
--- a/production/gather-parts.sh
+++ b/production/gather-parts.sh
@@ -12,12 +12,12 @@ if [ ! -r "$1" ]; then
   exit 1
 fi
 
+source "$1"
+
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 
 source $SCRIPT_PATH/build-functions.shsource
 
-source "$1"
-
 cd $BUILD_ROOT
 
 # derived values
diff --git a/production/get-aggregator.sh b/production/get-aggregator.sh
index e1607c40a..2d141b05e 100644
--- a/production/get-aggregator.sh
+++ b/production/get-aggregator.sh
@@ -14,13 +14,12 @@ if [ ! -r "$1" ]; then
   exit 1
 fi
 
+source "$1"
+
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 
 source $SCRIPT_PATH/build-functions.shsource
 
-source "$1"
-
-
 cd $BUILD_ROOT
 
 # derived values
diff --git a/production/parse-logs.sh b/production/parse-logs.sh
index 5d7fe3588..50d1e4169 100644
--- a/production/parse-logs.sh
+++ b/production/parse-logs.sh
@@ -12,11 +12,13 @@ if [ ! -r "$1" ]; then
   exit 1
 fi
 
+source "$1"
+
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 
 source $SCRIPT_PATH/build-functions.shsource
 
-source "$1"
+
 
 
 cd $BUILD_ROOT
diff --git a/production/pom-version-updater.sh b/production/pom-version-updater.sh
index 66d412508..50b1dff0d 100755
--- a/production/pom-version-updater.sh
+++ b/production/pom-version-updater.sh
@@ -12,13 +12,12 @@ if [ ! -r "$1" ]; then
   exit 1
 fi
 
+source "$1"
+
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 
 source $SCRIPT_PATH/build-functions.shsource
 
-source "$1"
-
-
 cd $BUILD_ROOT
 
 # derived values
diff --git a/production/promote-build.sh b/production/promote-build.sh
index c92c96fc9..78ef67ac4 100755
--- a/production/promote-build.sh
+++ b/production/promote-build.sh
@@ -11,6 +11,8 @@ function usage ()
   printf "\n\n\t%s\n" "promote-build.sh env_file"
 }
 
+source "$1" 2>/dev/null
+
 if [[ -z ${SCRIPT_PATH} ]]
 then
   SCRIPT_PATH=${PWD}
@@ -18,8 +20,6 @@ fi
 
 source $SCRIPT_PATH/build-functions.shsource
 
-source "$1" 2>/dev/null
-
 # The 'workLocation' provides a handy central place to have the
 # promote script, and log results. ASSUMING this works for all
 # types of builds, etc (which is the goal for the sdk promotions).
diff --git a/production/publish-repo.sh b/production/publish-repo.sh
index 569c63a23..4bb1f6470 100644
--- a/production/publish-repo.sh
+++ b/production/publish-repo.sh
@@ -12,12 +12,12 @@ if [ ! -r "$1" ]; then
   exit 1
 fi
 
+source "$1"
+
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 
 source $SCRIPT_PATH/build-functions.shsource
 
-source "$1"
-
 # derived values
 gitCache=$( fn-git-cache "$BUILD_ROOT")
 aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
diff --git a/production/run-maven-build.sh b/production/run-maven-build.sh
index 70849a314..358fe6d70 100644
--- a/production/run-maven-build.sh
+++ b/production/run-maven-build.sh
@@ -12,13 +12,12 @@ if [ ! -r "$1" ]; then
   exit 1
 fi
 
+source "$1"
+
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 
 source $SCRIPT_PATH/build-functions.shsource
 
-source "$1"
-
-
 cd $BUILD_ROOT
 
 # derived values
diff --git a/production/tag-build-input.sh b/production/tag-build-input.sh
index c3cfe0867..039ad4ee5 100644
--- a/production/tag-build-input.sh
+++ b/production/tag-build-input.sh
@@ -12,12 +12,12 @@ if [ ! -r "$1" ]; then
   exit 1
 fi
 
+source "$1"
+
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 
 source $SCRIPT_PATH/build-functions.shsource
 
-source "$1"
-
 cd $BUILD_ROOT
 
 # derived values
diff --git a/production/update-build-input.sh b/production/update-build-input.sh
index 16bb8e472..90969d402 100644
--- a/production/update-build-input.sh
+++ b/production/update-build-input.sh
@@ -12,13 +12,12 @@ if [ ! -r "$1" ]; then
   exit 1
 fi
 
+source "$1"
+
 SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
 
 source $SCRIPT_PATH/build-functions.shsource
 
-source "$1"
-
-
 cd $BUILD_ROOT
 
 # derived values