diff options
| -rw-r--r-- | cje-production/buildproperties.txt | 5 | ||||
| -rwxr-xr-x | cje-production/master-build.sh | 1 | ||||
| -rwxr-xr-x | cje-production/mbscripts/mb010_createEnvfiles.sh | 7 | ||||
| -rwxr-xr-x | cje-production/mbscripts/mb300_gatherEclipseParts.sh | 1 |
4 files changed, 12 insertions, 2 deletions
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt index e4ccce44d..5fae0fe5e 100644 --- a/cje-production/buildproperties.txt +++ b/cje-production/buildproperties.txt @@ -18,6 +18,7 @@ # CJE build variables BRANCH="master" PATCH_OR_BRANCH_LABEL="master" +BUILD_TYPE_NAME="Integration" BUILD_TYPE="I" TESTED_BUILD_TYPE="I" RELEASE_VER="4.12" @@ -37,8 +38,10 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates" LOCAL_REPO="localMavenRepo" # Base builder parameters -PREVIOUS_RELEASE_ID="R-4.11-201903070500" +BASEBUILDER_TAG="4.11" +API_PREV_REF_LABEL="4.11" PREVIOUS_RELEASE_VER="4.11" +PREVIOUS_RELEASE_ID="R-4.11-201903070500" BUILDTOOLS_REPO="http://build.eclipse.org/eclipse/buildtools/" WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repositoryunittests/" WEBTOOLS_VER="1.2.0.v201405010053" diff --git a/cje-production/master-build.sh b/cje-production/master-build.sh index 3344a469b..a0b64e3eb 100755 --- a/cje-production/master-build.sh +++ b/cje-production/master-build.sh @@ -37,3 +37,4 @@ cp $CJE_ROOT/buildproperties.txt $CJE_ROOT/$DROP_DIR/$BUILD_ID mv $CJE_ROOT/buildproperties.php $CJE_ROOT/$DROP_DIR/$BUILD_ID mv $CJE_ROOT/buildproperties.properties $CJE_ROOT/$DROP_DIR/$BUILD_ID mv $CJE_ROOT/buildproperties.shsource $CJE_ROOT/$DROP_DIR/$BUILD_ID +cp $CJE_ROOT/$DROP_DIR/$BUILD_ID/buildproperties.* $CJE_ROOT/$EQUINOX_DROP_DIR/$BUILD_ID 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 |