Skip to content
Snippets Groups Projects
Commit 55e1d3cc authored by david_williams's avatar david_williams
Browse files

257813 we should update to cruisecontrol 2.8

parent 0f584410
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ fi ...@@ -26,7 +26,7 @@ fi
# Note: this must be Java 4, for now, for "customizeAccessRules" # Note: this must be Java 4, for now, for "customizeAccessRules"
# to work. I'll recompile it for Java 5 eventually, but it causes # to work. I'll recompile it for Java 5 eventually, but it causes
# a problem, and a problem only on PPC machine/VM. # a problem, and a problem only on PPC machine/VM.
export JAVA_HOME=${JAVA_4_HOME} export JAVA_HOME=${JAVA_5_HOME}
ANT_CMD="${ANT_HOME}/bin/ant" ANT_CMD="${ANT_HOME}/bin/ant"
exec "$ANT_CMD" "$@" exec "$ANT_CMD" "$@"
...@@ -19,10 +19,12 @@ trivialPw="ballad" ...@@ -19,10 +19,12 @@ trivialPw="ballad"
rm -fr ./workspace rm -fr ./workspace
CCNAME="Webtools" CCNAME="Webtools-"
# We want to execute CC itself in Java 5 # We want to execute CC itself in Java 5
export JAVA_HOME=${JAVA_5_HOME} export JAVA_HOME=${JAVA_5_HOME}
sh ${CCDIR}/cruisecontrol.sh -configfile ${RELENG_CONTROL}/cc_config.xml -jmxport $jmxport -rmiport $rmiport -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname ${CCNAME} 1>out.txt 2>err.txt & export JETTY_HOME=${CCDIR}
sh ${CCDIR}/cruisecontrol.sh -configfile ${RELENG_CONTROL}/cc_config.xml -jmxport $jmxport -rmiport $rmiport -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname ${CCNAME} -webapppath ${CCDIR}/webapps/cruisecontrol -jettyxml ${CCDIR}/etc/jetty.xml -dashboardurl http://wtp.rtp.raleigh.ibm.com:7777/dashboard 1>out.txt 2>err.txt &
...@@ -74,8 +74,10 @@ ...@@ -74,8 +74,10 @@
<plugin <plugin
name="project" name="project"
buildafterfailed="false"> buildafterfailed="false">
<!-- dateformat had to be removed for CC 2.8.0
<dateformat <dateformat
format="yyyy-MM-dd HH:mm '('z')'" /> format="yyyy-MM-dd HH:mm '('z')'" />
-->
<log <log
dir="${env.LOG_DIR}/${project.name}" dir="${env.LOG_DIR}/${project.name}"
encoding="ISO-8859-1"> encoding="ISO-8859-1">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment