Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-06-15 15:19:13 -0400
committerDavid Williams2013-06-15 15:19:13 -0400
commit8219785a793c5ddd8a49678f50e657fd8d14f776 (patch)
treeb737dc426ff0ebee4dbcde1f94f8dd71d442f29f
parent9cd94c3e5f34eaf3e8346bffec362ae6051c4a4c (diff)
downloadeclipse.platform.releng.aggregator-8219785a793c5ddd8a49678f50e657fd8d14f776.tar.gz
eclipse.platform.releng.aggregator-8219785a793c5ddd8a49678f50e657fd8d14f776.tar.xz
eclipse.platform.releng.aggregator-8219785a793c5ddd8a49678f50e657fd8d14f776.zip
Bug 409686 - Prep for 4.4 builds and 4.3 maintenance builds
-rwxr-xr-xbootstrap/bootstrap.sh17
-rwxr-xr-xbootstrap/mb3M.sh104
-rwxr-xr-xbootstrap/mb4I.sh2
-rwxr-xr-xbootstrap/mb4M.sh4
-rwxr-xr-xbootstrap/mb4N.sh2
-rwxr-xr-xbootstrap/wgetFresh.sh1
6 files changed, 4 insertions, 126 deletions
diff --git a/bootstrap/bootstrap.sh b/bootstrap/bootstrap.sh
index fd2b4c33..88b68195 100755
--- a/bootstrap/bootstrap.sh
+++ b/bootstrap/bootstrap.sh
@@ -24,23 +24,6 @@ BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
reponame=eclipse.platform.releng.aggregator
-#BRANCH=master
-#BUILD_TYPE=N
-#STREAM=4.3.0
-
-#BRANCH=master
-#BUILD_TYPE=I
-#STREAM=4.3.0
-
-#BRANCH=R3_8_maintenance
-#BUILD_TYPE=M
-#STREAM=3.8.2
-
-#BRANCH=R4_2_maintenance
-#BUILD_TYPE=M
-#STREAM=4.2.2
-
-
# contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression.
if [[ "${STREAM}" =~ ([[:digit:]]*)\.([[:digit:]]*)\.([[:digit:]]*) ]]
then
diff --git a/bootstrap/mb3M.sh b/bootstrap/mb3M.sh
deleted file mode 100755
index 3c78a8d8..00000000
--- a/bootstrap/mb3M.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/usr/bin/env bash
-
-# Simple utility to run as cronjob to run Eclipse Platform builds
-# Normally resides in $BUILD_HOME
-
-function usage() {
- printf "\n\tSimple script start a build of a certain stream." >&2
- printf "\n\tUsage: %s [[-h] | [-t]] " $(basename $0) >&2
- printf "\n\t\t%s\n" "where h==help, t==test build " >&2
-}
-# all optional
-# normally, when ran from crobjob, none should be specified
-while getopts 'ht' OPTION
-do
- case $OPTION in
- h) usage
- exit
- ;;
- t) export testbuildonly=true
- ;;
-# ?) usage
-# exit 2
-# ;;
- esac
-done
-
-SCRIPT_NAME=$0
-MB_LOG_DIR=/shared/eclipse/builds
-LOG_BASE_NAME=${SCRIPT_NAME##*/}
-LOG_OUT_NAME=${MB_LOG_DIR}/${LOG_BASE_NAME%.*}.out.log
-LOG_ERR_NAME=${MB_LOG_DIR}/${LOG_BASE_NAME%.*}.err.log
-
-echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) " 1>$LOG_OUT_NAME 2>$LOG_ERR_NAME
-
-# Start with minimal path for consistency across machines
-# plus, cron jobs do not inherit an environment
-# care is needed not have anything in ${HOME}/bin that would effect the build
-# unintentionally, but is required to make use of "source buildeclipse.shsource" on
-# local machines.
-# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it
-# to false) for a test I-build on a remote machine.
-export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin
-# unset common variables (some defined for e4Build) which we don't want (or, set ourselves)
-unset JAVA_HOME
-unset JAVA_ROOT
-unset JAVA_JRE
-unset CLASSPATH
-unset JAVA_BINDIR
-unset JRE_HOME
-
-# 0002 is often the default for shell users, but it is not when ran from
-# a cron job, so we set it explicitly, so releng group has write access to anything
-# we create.
-oldumask=`umask`
-umask 0002
-echo "umask explicitly set to 0002, old value was $oldumask" 1>>$LOG_OUT_NAME 2>>$LOG_ERR_NAME
-
-# this buildeclipse.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source buildeclipse.shsource 2>/dev/null
-
-export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
-# we should not need the following here in boot strap, for now, but might in future
-#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_11}
-#export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.8.4}
-#export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=false"}
-#export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.0.4/bin}
-
-# no override for minimal $PATH
-#export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH
-
-export BRANCH=R3_8_maintenance
-export BUILD_TYPE=M
-export STREAM=3.8.2
-
-eclipseStreamMajor=${STREAM:0:1}
-
-# unique short name for stream and build type
-BUILDSTREAMTYPEDIR=${eclipseStreamMajor}$BUILD_TYPE
-
-export BUILD_ROOT=${BUILD_HOME}/${BUILDSTREAMTYPEDIR}
-
-export PRODUCTION_SCRIPTS_DIR=production
-
-
-$BUILD_HOME/bootstrap.sh $BRANCH $BUILD_TYPE $STREAM 1>>$LOG_OUT_NAME 2>>$LOG_ERR_NAME
-
-#BOOTSTRAPENVFILE=$BUILD_ROOT/env${BUILDSTREAMTYPEDIR}.txt
-#timestamp=$( date +%Y%m%d%H%M )
-#echo "Environment at time of starting build at ${timestamp}." > $BOOTSTRAPENVFILE
-#env >> $BOOTSTRAPENVFILE
-#echo "= = = = = " >> $BOOTSTRAPENVFILE
-#java -version >> $BOOTSTRAPENVFILE 2>&1
-#ant -version >> $BOOTSTRAPENVFILE
-#mvn -version >> $BOOTSTRAPENVFILE
-#echo "= = = = = " >> $BOOTSTRAPENVFILE
-
-${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/master-build.sh ${BUILD_ROOT}/${PRODUCTION_SCRIPTS_DIR}/build_eclipse_org.shsource 1>>$LOG_OUT_NAME 2>>$LOG_ERR_NAME &
-
-rc=$?
-if [[ $rc != 0 ]]
-then
- echo "BUILD FAILED. See run-maven-build-ouptut.txt." >&2
-fi
diff --git a/bootstrap/mb4I.sh b/bootstrap/mb4I.sh
index 8a0ac10e..93d29a46 100755
--- a/bootstrap/mb4I.sh
+++ b/bootstrap/mb4I.sh
@@ -71,7 +71,7 @@ export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
export BRANCH=master
export BUILD_TYPE=I
-export STREAM=4.3.0
+export STREAM=4.4.0
eclipseStreamMajor=${STREAM:0:1}
diff --git a/bootstrap/mb4M.sh b/bootstrap/mb4M.sh
index 51f439da..6cf69654 100755
--- a/bootstrap/mb4M.sh
+++ b/bootstrap/mb4M.sh
@@ -69,9 +69,9 @@ export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
# no override for minimal $PATH
#export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH
-export BRANCH=R4_2_maintenance
+export BRANCH=R4_3_maintenance
export BUILD_TYPE=M
-export STREAM=4.2.2
+export STREAM=4.3.1
eclipseStreamMajor=${STREAM:0:1}
diff --git a/bootstrap/mb4N.sh b/bootstrap/mb4N.sh
index ace6d523..6903c7fc 100755
--- a/bootstrap/mb4N.sh
+++ b/bootstrap/mb4N.sh
@@ -71,7 +71,7 @@ export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
export BRANCH=master
export BUILD_TYPE=N
-export STREAM=4.3.0
+export STREAM=4.4.0
eclipseStreamMajor=${STREAM:0:1}
diff --git a/bootstrap/wgetFresh.sh b/bootstrap/wgetFresh.sh
index 064097be..132b4ece 100755
--- a/bootstrap/wgetFresh.sh
+++ b/bootstrap/wgetFresh.sh
@@ -12,7 +12,6 @@ initScriptTag=master
# to build, all that's needed is the appropriate mbXZ.sh scripts. along with "bootstrap.sh".
# It gets what ever else it needs.
-wget --no-verbose --no-cache -O mb3M.sh http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/plain/bootstrap/mb3M.sh?h=$initScriptTag 2>&1;
wget --no-verbose --no-cache -O mb4M.sh http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/plain/bootstrap/mb4M.sh?h=$initScriptTag 2>&1;
wget --no-verbose --no-cache -O mb4I.sh http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/plain/bootstrap/mb4I.sh?h=$initScriptTag 2>&1;
wget --no-verbose --no-cache -O mb4N.sh http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/plain/bootstrap/mb4N.sh?h=$initScriptTag 2>&1;

Back to the top