diff options
| author | kitlo | 2019-05-03 02:48:01 +0000 |
|---|---|---|
| committer | kitlo | 2019-05-03 02:56:02 +0000 |
| commit | fbd76d1c07609f2b13e571c263acb184337d2b41 (patch) | |
| tree | f81337c541dab3899f4697a94a7f73d4fa2163a4 /cje-production/mbscripts | |
| parent | 0708229d0c93d0e88b6e79a6f8c8c068b78f9b15 (diff) | |
| download | eclipse.platform.releng.aggregator-fbd76d1c07609f2b13e571c263acb184337d2b41.tar.gz eclipse.platform.releng.aggregator-fbd76d1c07609f2b13e571c263acb184337d2b41.tar.xz eclipse.platform.releng.aggregator-fbd76d1c07609f2b13e571c263acb184337d2b41.zip | |
Bug 546947 - Define variables needed for download pages
Change-Id: I1fe7d4ee4f3aee7c96d2ad5626dbef294b0ad0dd
Signed-off-by: kitlo <kitlo@us.ibm.com>
Diffstat (limited to 'cje-production/mbscripts')
| -rwxr-xr-x | cje-production/mbscripts/mb010_createEnvfiles.sh | 7 | ||||
| -rwxr-xr-x | cje-production/mbscripts/mb300_gatherEclipseParts.sh | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cje-production/mbscripts/mb010_createEnvfiles.sh b/cje-production/mbscripts/mb010_createEnvfiles.sh index f4c151f54..c990c2490 100755 --- a/cje-production/mbscripts/mb010_createEnvfiles.sh +++ b/cje-production/mbscripts/mb010_createEnvfiles.sh @@ -38,7 +38,8 @@ fn-addToPropFiles () echo "$1 = $2" >> $BUILD_ENV_FILE_PROP } -echo "#!/bin/bash" >> $BUILD_ENV_FILE +echo "#!/bin/bash" > $BUILD_ENV_FILE +echo "<?php " > $BUILD_ENV_FILE_PHP # We set RAWDATE first thing here to make the "start of build" timestamp more accurate. # Note that a roundup is added to compensate the occasional delay. @@ -47,6 +48,7 @@ REMAINDER=$((RAWDATE % 600)) RAWDATE_TRUNC=$((RAWDATE - REMAINDER)) export RAWDATE fn-addToPropFiles TIMESTAMP "\"$(date +%Y%m%d-%H%M --date='@'$RAWDATE_TRUNC)\"" +fn-addToPropFiles BUILD_PRETTY_DATE "\"$(date --date='@'$RAWDATE_TRUNC)\"" while read propLine do @@ -69,5 +71,8 @@ fn-addToPropFiles BUILD_ENV_FILE_PHP "\"$BUILD_ENV_FILE_PHP\"" fn-addToPropFiles BUILD_ENV_FILE_PROP "\"$BUILD_ENV_FILE_PROP\"" # variables in buildproperties.txt are now defined, add other commonly used variables to prop files fn-addToPropFiles BUILD_ID "\"$BUILD_TYPE$TIMESTAMP\"" +fn-addToPropFiles BUILD_DIR_SEG "\"$BUILD_TYPE$TIMESTAMP\"" +fn-addToPropFiles EQ_BUILD_DIR_SEG "\"$BUILD_TYPE$TIMESTAMP\"" +fn-addToPropFiles EBUILDER_HASH "\"$(git show-ref --hash --verify refs/remotes/origin/${BRANCH})\"" fn-addToPropFiles ECLIPSE_BUILDER_DIR "\"$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder\"" fn-addToPropFiles PLATFORM_REPO_DIR "\"$CJE_ROOT/$AGG_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository\"" diff --git a/cje-production/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh index 818efce97..6010bbce6 100755 --- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh +++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh @@ -25,6 +25,7 @@ source $1 mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID mkdir -p $CJE_ROOT/$UPDATES_DIR/$BUILD_ID mkdir -p $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID +mkdir -p $CJE_ROOT/$DROP_DIR/$BUILD_ID/testresults/consolelogs # gather maven properties cp $CJE_ROOT/$AGG_DIR/eclipse-platform-parent/target/mavenproperties.properties $CJE_ROOT/$DROP_DIR/$BUILD_ID/mavenproperties.properties |