From 2f53d7b1432c80d42932a13d1b5a1e5040b1ff9c Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Mon, 3 Aug 2009 05:48:34 +0000
Subject: [PATCH] 285383 need a Helios build stream
---
releng.control/ant_low_priority_helios.sh | 25 +++++++
releng.control/cc_config.xml | 67 +++++++++++++++++++
.../distribution/wtp.build/build.xml | 8 ++-
.../distribution/wtp.site/publish.xml | 8 ++-
.../distribution/wtp.tests/build.xml | 11 ++-
.../distribution/wtp.tests/standaloneTest.xml | 16 ++++-
6 files changed, 126 insertions(+), 9 deletions(-)
create mode 100644 releng.control/ant_low_priority_helios.sh
diff --git a/releng.control/ant_low_priority_helios.sh b/releng.control/ant_low_priority_helios.sh
new file mode 100644
index 000000000..fc7294c26
--- /dev/null
+++ b/releng.control/ant_low_priority_helios.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+#
+# remember to leave no slashes on commonVariations in source command,
+# so that users path is used to find it (first). But, path on
+# commonComputedVariables means we expect to execute only our
+# version
+
+if [ -z $BUILD_INITIALIZED ]
+then
+# if releng_control not set, we assume we are already in releng_control directory
+ if [ -z $RELENG_CONTROL ]
+ then
+ RELENG_CONROL=`pwd`
+ fi
+ pushd .
+ cd ${RELENG_CONTROL}
+ source commonVariations.shsource
+ source ${RELENG_CONTROL}/commonComputedVariables.shsource
+ popd
+fi
+
+export DEP_DIR=helios
+
+echo "Running ant at priority +3"
+exec nice --adjustment 10 "${RELENG_CONTROL}/ant.sh" "$@"
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 88f276029..4dffd4f89 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -899,4 +899,71 @@
</ant>
</schedule>
</project>
+ <project
+ forceOnly="false"
+ requireModification="true"
+ name="wtp-R3.3-I">
+ <modificationset
+ quietperiod="120">
+ <cvs
+ module="${env.RELENGCOMMON}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ module="${env.RELENGEJBTOOLS}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ module="${env.RELENGJEETOOLS}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ module="${env.RELENGSERVERTOOLS}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ module="${env.RELENGSOURCEEDITING}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ module="${env.RELENGWEBSERVICES}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ module="${env.RELENGJSF}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ <cvs
+ module="${env.RELENGDALI}"
+ reallyquiet="${env.CVS_QUIET}"/>
+ </modificationset>
+ <schedule
+ interval="${time.twentyFourHours}">
+ <ant
+ antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh">
+ <property
+ name="buildType"
+ value="I"/>
+ <property
+ name="buildId"
+ value="3.2I"/>
+ <property
+ name="buildBranch"
+ value="R3.2"/>
+ <property
+ name="mapVersionTag"
+ value="HEAD"/>
+ <property
+ name="releng.dali-mapVersionTag"
+ value="HEAD"/>
+ <property
+ name="releng.jsf-mapVersionTag"
+ value="HEAD"/>
+ <property
+ name="build.distribution"
+ value="wtp"/>
+<!-- remember to remove these "skips" as we approach a test or declared build -->
+ <property
+ name="SKIP_JAR_SIGNING"
+ value="true"/>
+ <property
+ name="normalizeJarFiles"
+ value="false"/>
+ </ant>
+ </schedule>
+ </project>
+
</cruisecontrol>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index 012f3dcb1..47e7242d4 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -30,10 +30,14 @@
name="buildTargets"
value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
- <!-- for this distribution, dependencies come from releng -->
+ <!-- for this distribution, dependencies come from releng.
+ assume no subdirectory, if not otherwise set (bug 285383).
+ -->
+ <property name="env.DEP_DIR" value="" />
+
<property
name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties"/>
+ value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
<!-- calling label.xml to createg label.properties file -->
<ant
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index 82c66ec92..d8e750be3 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -85,8 +85,14 @@
testManifestFileName: name of xml file containing
descriptions of zip types and log files
-->
+ <!-- for this distribution, dependencies come from releng.
+ assume no subdirectory, if not otherwise set (bug 285383).
+ -->
+ <property name="env.DEP_DIR" value="" />
+
<property
- file="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties"/>
+ name="dependency.properties"
+ value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
<!-- create tables of test plugin compiles first -->
<antcall
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 5b82bfcee..e99272f0a 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -93,9 +93,14 @@
<ant
antfile="${test.component.dir}/testdependency.xml"
target="get">
- <property
- name="dependency.properties"
- value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties"/>
+ <!-- for this distribution, dependencies come from releng.
+ assume no subdirectory, if not otherwise set (bug 285383).
+ -->
+ <property name="env.DEP_DIR" value="" />
+
+ <property
+ name="dependency.properties"
+ value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
<property
name="base.install.dir"
value="${testRoot}"/>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
index 7a487eb62..714391b9b 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
@@ -43,17 +43,27 @@
dir="${testRoot}"/>
<antcall
target="getReleng"/>
+
+
+ <!-- for this distribution, dependencies come from releng.
+ assume no subdirectory, if not otherwise set (bug 285383).
+ -->
+ <property name="env.DEP_DIR" value="" />
<fail
- message="Required file does not exist: ${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/dependencies.properties">
+ message="Required file does not exist: ${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties">
<condition>
<not>
<available
- file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/dependencies.properties"/>
+ file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
</not>
</condition>
</fail>
+
+
<property
- file="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/dependencies.properties"/>
+ name="dependency.properties"
+ value="${buildDirectory}/maps/${env.RELENG}/${env.DEP_DIR}/maps/dependencies.properties"/>
+
<antcall
target="getDependencies"/>
<antcall
--
GitLab