Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2016-03-26 19:00:03 -0400
committerDavid Williams2016-03-26 19:00:03 -0400
commit32d840ba3104e456c0ebc66b55e6bb930a658a2a (patch)
tree74243caa438e1d0101299189ae53c7f713d72551
parent8195a827f5507aced641f260bbc011c00ce3d01d (diff)
downloadeclipse.platform.releng.aggregator-32d840ba3104e456c0ebc66b55e6bb930a658a2a.tar.gz
eclipse.platform.releng.aggregator-32d840ba3104e456c0ebc66b55e6bb930a658a2a.tar.xz
eclipse.platform.releng.aggregator-32d840ba3104e456c0ebc66b55e6bb930a658a2a.zip
Bug 487044 - Migrate some (most) cron jobs to Releng HIPP Instance
This is mostly misc. cleanup. But primarily trying to get "createReports" to work at the end of the build.
-rwxr-xr-xproduction/buildTycho.sh2
-rwxr-xr-xproduction/createReports.sh6
-rwxr-xr-xproduction/gather-parts.sh2
-rwxr-xr-xproduction/get-aggregator.sh2
-rwxr-xr-xproduction/getEBuilderForDropDir.sh2
-rwxr-xr-xproduction/master-build.sh6
-rwxr-xr-xproduction/parse-logs.sh2
-rwxr-xr-xproduction/parse-opts.sh2
-rwxr-xr-xproduction/pom-version-updater.sh2
-rwxr-xr-xproduction/publish-eclipse.sh2
-rwxr-xr-xproduction/publish-equinox.sh2
-rwxr-xr-xproduction/publish-repo.sh2
-rwxr-xr-xproduction/run-maven-build.sh2
-rwxr-xr-xproduction/tag-build-input.sh2
-rwxr-xr-xproduction/update-build-input.sh2
15 files changed, 20 insertions, 18 deletions
diff --git a/production/buildTycho.sh b/production/buildTycho.sh
index 90f50d23..78e6f9b7 100755
--- a/production/buildTycho.sh
+++ b/production/buildTycho.sh
@@ -9,7 +9,7 @@ then
fi
# Similar for SCRIPT_PATH, relevant here only if local, isolated
# build, else, it is defined elsewhere.
-SCRIPT_PATH=${SCRIPT_PATH:-${PWD}}
+export SCRIPT_PATH=${SCRIPT_PATH:-${PWD}}
TYCHO_MVN_ARGS="-Dmaven.repo.local=$LOCAL_REPO -Dtycho.localArtifacts=ignore"
echo -e "\n\tTYCHO_MVN_ARGS: ${TYCHO_MVN_ARGS}\n"
diff --git a/production/createReports.sh b/production/createReports.sh
index 3bb53264..6900b6a6 100755
--- a/production/createReports.sh
+++ b/production/createReports.sh
@@ -39,9 +39,9 @@ mkdir -p ${output_dir}
tar_name=org.eclipse.cbi.p2repo.analyzers.product-linux.gtk.x86_64.tar.gz
report_app_area="${app_area}/reportApplication"
-if [[ ! -e ${tar_name} ]]
+if [[ ! -e ${TMP_DIR}/${tar_name} ]]
then
- wget --no-verbose --no-cache https://hudson.eclipse.org/cbi/job/cbi.p2repo.analyzers.build/lastSuccessfulBuild/artifact/output/products/${tar_name} 2>&1
+ wget --no-verbose --no-cache -O ${TMP_DIR}/${tar_name} https://hudson.eclipse.org/cbi/job/cbi.p2repo.analyzers.build/lastSuccessfulBuild/artifact/output/products/${tar_name} 2>&1
fi
# always extract anew each time.
if [[ -e ${report_app_area} ]]
@@ -50,7 +50,7 @@ then
fi
mkdir -p ${report_app_area}
-tar -xf org.eclipse.cbi.p2repo.analyzers.product-linux.gtk.x86_64.tar.gz -C ${report_app_area}
+tar -xf ${TMP_DIR}/${tar_name} -C ${report_app_area}
${report_app_area}/p2analyze -data ${output_dir}/workspace-report -vm ${JAVA_8_HOME}/bin -vmargs -Xmx1g \
-DreportRepoDir=${buildToTest} \
diff --git a/production/gather-parts.sh b/production/gather-parts.sh
index bfcacff2..5d4f8899 100755
--- a/production/gather-parts.sh
+++ b/production/gather-parts.sh
@@ -14,7 +14,7 @@ fi
source "$1"
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
source $SCRIPT_PATH/build-functions.shsource
diff --git a/production/get-aggregator.sh b/production/get-aggregator.sh
index 2d141b05..01cf6e1d 100755
--- a/production/get-aggregator.sh
+++ b/production/get-aggregator.sh
@@ -16,7 +16,7 @@ fi
source "$1"
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
source $SCRIPT_PATH/build-functions.shsource
diff --git a/production/getEBuilderForDropDir.sh b/production/getEBuilderForDropDir.sh
index 325c470b..ee38ee4a 100755
--- a/production/getEBuilderForDropDir.sh
+++ b/production/getEBuilderForDropDir.sh
@@ -6,7 +6,7 @@
printf "\n\tDEBUG: %s\n" "executing ${0}"
printf "\t\t\t%s\n" "As called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[0]} in ${BASH_SOURCE[1]}."
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
printf "\n\tINFO: %s\n" "SCRIPT_PATH: $SCRIPT_PATH"
source $SCRIPT_PATH/build-functions.shsource
diff --git a/production/master-build.sh b/production/master-build.sh
index 9e1def8e..7566b20a 100755
--- a/production/master-build.sh
+++ b/production/master-build.sh
@@ -425,10 +425,12 @@ fi
# create repo reports. Depends on exported 'BUILD_ID'.
$SCRIPT_PATH/createReports.sh
-checkForErrorExit $? "Error occurred during createReports.sh"
+#For now, do not fail if create reports fails, since
+# Since it did once while moving to triggering builds from Hudson (bug 487044).
+#checkForErrorExit $? "Error occurred during createReports.sh"
# if all ended well, put "promotion scripts" in known locations
-$SCRIPT_PATH/promote-build.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/mb090_promote-build_output.txt
+$SCRIPT_PATH/promote-build.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/mb090_promote-build_output.txt#
checkForErrorExit $? "Error occurred during promote-build"
# check for dirt in working tree. Note. we want near very end, since even things
diff --git a/production/parse-logs.sh b/production/parse-logs.sh
index 50d1e416..4d7a8879 100755
--- a/production/parse-logs.sh
+++ b/production/parse-logs.sh
@@ -14,7 +14,7 @@ fi
source "$1"
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
source $SCRIPT_PATH/build-functions.shsource
diff --git a/production/parse-opts.sh b/production/parse-opts.sh
index 81447f98..9cf6b6d6 100755
--- a/production/parse-opts.sh
+++ b/production/parse-opts.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
set -- $( getopt -l buildArea:,stream:,branch: -o "" -- "$@" )
diff --git a/production/pom-version-updater.sh b/production/pom-version-updater.sh
index b6d45b03..1f0d68e8 100755
--- a/production/pom-version-updater.sh
+++ b/production/pom-version-updater.sh
@@ -14,7 +14,7 @@ fi
source "$1"
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
source $SCRIPT_PATH/build-functions.shsource
diff --git a/production/publish-eclipse.sh b/production/publish-eclipse.sh
index 9a57a645..634f9d33 100755
--- a/production/publish-eclipse.sh
+++ b/production/publish-eclipse.sh
@@ -14,7 +14,7 @@ fi
source "$1"
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
cd $BUILD_ROOT
diff --git a/production/publish-equinox.sh b/production/publish-equinox.sh
index 216b794c..3f5909d3 100755
--- a/production/publish-equinox.sh
+++ b/production/publish-equinox.sh
@@ -19,7 +19,7 @@ fi
source "$1"
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
source $SCRIPT_PATH/build-functions.shsource
diff --git a/production/publish-repo.sh b/production/publish-repo.sh
index a211f5a5..6888af81 100755
--- a/production/publish-repo.sh
+++ b/production/publish-repo.sh
@@ -14,7 +14,7 @@ fi
source "$1"
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
source $SCRIPT_PATH/build-functions.shsource
diff --git a/production/run-maven-build.sh b/production/run-maven-build.sh
index 358fe6d7..3815d0e5 100755
--- a/production/run-maven-build.sh
+++ b/production/run-maven-build.sh
@@ -14,7 +14,7 @@ fi
source "$1"
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
source $SCRIPT_PATH/build-functions.shsource
diff --git a/production/tag-build-input.sh b/production/tag-build-input.sh
index 039ad4ee..7eeb1b98 100755
--- a/production/tag-build-input.sh
+++ b/production/tag-build-input.sh
@@ -14,7 +14,7 @@ fi
source "$1"
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
source $SCRIPT_PATH/build-functions.shsource
diff --git a/production/update-build-input.sh b/production/update-build-input.sh
index 90969d40..f9d063e1 100755
--- a/production/update-build-input.sh
+++ b/production/update-build-input.sh
@@ -14,7 +14,7 @@ fi
source "$1"
-SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
+export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
source $SCRIPT_PATH/build-functions.shsource

Back to the top