Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkitlo2019-05-02 22:48:01 -0400
committerkitlo2019-05-02 22:56:02 -0400
commitfbd76d1c07609f2b13e571c263acb184337d2b41 (patch)
treef81337c541dab3899f4697a94a7f73d4fa2163a4
parent0708229d0c93d0e88b6e79a6f8c8c068b78f9b15 (diff)
downloadeclipse.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>
-rw-r--r--cje-production/buildproperties.txt5
-rwxr-xr-xcje-production/master-build.sh1
-rwxr-xr-xcje-production/mbscripts/mb010_createEnvfiles.sh7
-rwxr-xr-xcje-production/mbscripts/mb300_gatherEclipseParts.sh1
4 files changed, 12 insertions, 2 deletions
diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
index e4ccce44..5fae0fe5 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 3344a469..a0b64e3e 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 f4c151f5..c990c249 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 818efce9..6010bbce 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

Back to the top