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

285383 - need a Helios build stream

parent e0918c52
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 121 additions and 136 deletions
releng.control/ant_high_priority_galileo.sh → releng.control/ant_high_priority.sh
+ 0
− 3
View file @ f46c7719
......@@ -19,8 +19,5 @@ then
popd
fi
# directory under releng for maps/dependencies.properties
export DEP_DIR=/galileo
echo "DEP_DIR: " $DEP_DIR
echo "Running ant at priority " $JOB_NOT_NICE
exec nice --adjustment $JOB_NOT_NICE "${RELENG_CONTROL}/ant.sh" "$@"
releng.control/ant_high_priority_helios.sh deleted 100644 → 0
+ 0
− 26
View file @ e0918c52
#!/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
# directory under releng for maps/dependencies.properties
export DEP_DIR=/helios
echo "DEP_DIR: " $DEP_DIR
echo "Running ant at priority " $JOB_NOT_NICE
exec nice --adjustment $JOB_NICER "${RELENG_CONTROL}/ant.sh" "$@"
releng.control/ant_low_priority_galileo.sh deleted 100644 → 0
+ 0
− 26
View file @ e0918c52
#!/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
# directory under releng for maps/dependencies.properties
export DEP_DIR=/galileo
echo "DEP_DIR: " $DEP_DIR
echo "Running ant at priority " $JOB_NICER
exec nice --adjustment $JOB_NICER "${RELENG_CONTROL}/ant.sh" "$@"
releng.control/ant_low_priority_helios.sh deleted 100644 → 0
+ 0
− 26
View file @ e0918c52
#!/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
# directory under releng for maps/dependencies.properties
export DEP_DIR=/helios
echo "DEP_DIR: " $DEP_DIR
echo "Running ant at priority " $JOB_NICER
exec nice --adjustment $JOB_NICER "${RELENG_CONTROL}/ant.sh" "$@"
releng.control/cc_config.xml
+ 102
− 23
View file @ f46c7719
......@@ -37,7 +37,7 @@
value="18000"/>
<property
name="time.twelveHours"
value="43200"/>
value="43200"/>
<property
name="time.twentyFourHours"
value="86400"/>
......@@ -60,7 +60,7 @@
-->
<plugin
name="ant"
antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh"
antscript="${env.RELENG_CONTROL}/ant_low_priority.sh"
buildfile="${env.RELENG_CONTROL}/cc_project_build.xml"
target="Build"
uselogger="${env.USE_LOGGER}"
......@@ -191,6 +191,12 @@
<schedule
interval="${time.veryLongTime}">
<ant>
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="I"/>
......@@ -223,6 +229,12 @@
<schedule
interval="${time.oneHour}">
<ant>
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="I"/>
......@@ -266,6 +278,12 @@
<schedule
interval="${time.oneHour}">
<ant>
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="I"/>
......@@ -296,7 +314,14 @@
</modificationset>
<schedule
interval="${time.oneHour}">
<ant>
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/testdependency.xml"/>
<property
name="buildId"
value="3.3.0"/>
......@@ -329,6 +354,12 @@
<schedule
interval="${time.oneHour}">
<ant>
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="I"/>
......@@ -367,6 +398,12 @@
<schedule
interval="${time.oneHour}">
<ant>
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/jsdttestdependency.xml"/>
<property
name="buildType"
value="I"/>
......@@ -409,6 +446,12 @@
<schedule
interval="${time.oneHour}">
<ant>
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/jsdttestdependency.xml"/>
<property
name="buildType"
value="M"/>
......@@ -420,7 +463,7 @@
value="1.2.1"/>
<property
name="mapVersionTag"
value="R3_2_maintenance"/>
value="R3_2_maintenance"/>
<property
name="releng.jsdt-mapVersionTag"
value="R3_2_maintenance"/>
......@@ -440,7 +483,7 @@
</ant>
</schedule>
</project>
<project
forceOnly="true"
forceBuildNewProject="false"
......@@ -623,7 +666,13 @@
<schedule
interval="${time.veryLongTime}">
<ant
antscript="${env.RELENG_CONTROL}/ant_high_priority_helios.sh">
antscript="${env.RELENG_CONTROL}/ant_high_priority.sh">
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/testdependency.xml"/>
<property
name="passBuildEvenIfFailedTests"
value="true"/>
......@@ -645,12 +694,12 @@
<property
name="releng.jsf-mapVersionTag"
value="R3_2_1_patches"/>
<property
name="releng.jsdt-mapVersionTag"
value="R3_2_1_patches"/>
<property
name="build.distribution"
value="patches32x"/>
......@@ -677,7 +726,7 @@
</htmlemail>
</publishers>
</project>
<project
<project
forceOnly="true"
forceBuildNewProject="false"
requireModification="true"
......@@ -689,7 +738,13 @@
<schedule
interval="${time.veryLongTime}">
<ant
antscript="${env.RELENG_CONTROL}/ant_high_priority_galileo.sh">
antscript="${env.RELENG_CONTROL}/ant_high_priority.sh">
<property
name="dependencyFileLocation"
value="galileo/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="galileo/maps/testdependency.xml"/>
<property
name="passBuildEvenIfFailedTests"
value="true"/>
......@@ -736,9 +791,9 @@
file=""/>
</htmlemail>
</publishers>
</project>
<project
</project>
<project
forceOnly="false"
requireModification="true"
name="wtp-R3.2.2-M">
......@@ -784,7 +839,13 @@
<schedule
interval="${time.oneHour}">
<ant
antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh">
antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="M"/>
......@@ -805,17 +866,17 @@
value="R3_2_maintenance"/>
<property
name="releng.jsdt-mapVersionTag"
value="R3_2_maintenance"/>
value="R3_2_maintenance"/>
<property
name="build.distribution"
value="wtp"/>
</ant>
</schedule>
</project>
<project
forceOnly="false"
requireModification="true"
......@@ -853,7 +914,13 @@
<schedule
interval="${time.oneHour}">
<ant
antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh">
antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="S"/>
......@@ -875,7 +942,7 @@
<property
name="releng.jsdt-mapVersionTag"
value="HEAD"/>
<property
name="build.distribution"
value="wtp"/>
......@@ -919,7 +986,13 @@
<schedule
interval="${time.fourHours}">
<ant
antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh">
antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="I"/>
......@@ -968,7 +1041,13 @@
<schedule
interval="${time.veryLongTime}">
<ant
antscript="${env.RELENG_CONTROL}/ant_low_priority_helios.sh">
antscript="${env.RELENG_CONTROL}/ant_low_priority.sh">
<property
name="dependencyFileLocation"
value="helios/maps/dependencies.properties"/>
<property
name="testdependencyFileLocation"
value="helios/maps/testdependency.xml"/>
<property
name="buildType"
value="N"/>
......@@ -990,7 +1069,7 @@
value="HEAD"/>
<property
name="releng.jsdt-mapVersionTag"
value="HEAD"/>
value="HEAD"/>
<property
name="build.distribution"
value="wtp"/>
......
releng.wtpbuilder/buildtemplates/distribution/template.build/build.xml
+ 1
− 1
View file @ f46c7719
......@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
......
releng.wtpbuilder/buildtemplates/distribution/template.site/build.xml
+ 1
− 1
View file @ f46c7719
......@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
value="-DbuildType=${buildType}"/>
value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
......
releng.wtpbuilder/buildtemplates/distribution/template.site/publish.xml
+ 2
− 2
View file @ f46c7719
......@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
......@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
......
releng.wtpbuilder/buildtemplates/distribution/template.tests/build.xml
+ 3
− 9
View file @ f46c7719
......@@ -83,16 +83,10 @@
</copy>
<echo
message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} "/>
<!--
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"/>
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<available
file="${dependency.properties}"
property="dependency.properties.exists"/>
......@@ -242,7 +236,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
value="-DbuildType=${buildType}"/>
value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
......
releng.wtpbuilder/components/common-sdk/customTargets.xml
+ 1
− 1
View file @ f46c7719
......@@ -144,7 +144,7 @@
target="get">
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
......
releng.wtpbuilder/components/common.tests/customTargets.xml
+ 1
− 1
View file @ f46c7719
......@@ -146,7 +146,7 @@
target="get">
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
......
releng.wtpbuilder/components/common/customTargets.xml
+ 1
− 1
View file @ f46c7719
......@@ -145,7 +145,7 @@
target="get">
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
......
releng.wtpbuilder/components/wtp-patches-tests/customTargets.xml
+ 1
− 5
View file @ f46c7719
......@@ -150,14 +150,10 @@
<ant
antfile="${component.dir}/dependency.xml"
target="get">
<property
name="env.DEP_DIR"
value=""/>
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
......
releng.wtpbuilder/components/wtp-patches2-tests/customTargets.xml
+ 1
− 1
View file @ f46c7719
......@@ -152,7 +152,7 @@
target="get">
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
......
releng.wtpbuilder/components/wtp-patches2/customTargets.xml
+ 1
− 1
View file @ f46c7719
......@@ -146,7 +146,7 @@
target="get">
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
......
releng.wtpbuilder/components/wtp-patches3-tests/customTargets.xml
+ 1
− 4
View file @ f46c7719
......@@ -151,13 +151,10 @@
antfile="${component.dir}/dependency.xml"
target="get">
<property
name="env.DEP_DIR"
value=""/>
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties" />
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}" />
<property
name="base.install.dir"
value="${buildRoot}" />
......
releng.wtpbuilder/distribution/dali.tests/build.xml
+ 1
− 1
View file @ f46c7719
......@@ -229,7 +229,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
value="-DbuildType=${buildType}"/>
value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
......
releng.wtpbuilder/distribution/jaxws.build/build.xml
+ 1
− 1
View file @ f46c7719
......@@ -20,7 +20,7 @@
-->
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- calling label.xml to createg label.properties file -->
<ant
......
releng.wtpbuilder/distribution/jaxws.site/build.xml
+ 1
− 1
View file @ f46c7719
......@@ -41,7 +41,7 @@
<jvmarg
value="-DbuildBranch=${buildBranch}"/>
<jvmarg
value="-DbuildType=${buildType}"/>
value="-DbuildType=${buildType}"/><jvmarg value="-DdependencyFileLocation=${dependencyFileLocation}"/> <jvmarg value="-DtestdependencyFileLocation=${testdependencyFileLocation}"/>
<jvmarg
value="-DbuildId=${buildId}"/>
<jvmarg
......
releng.wtpbuilder/distribution/jaxws.site/publish.xml
+ 2
− 2
View file @ f46c7719
......@@ -86,7 +86,7 @@
descriptions of zip types and log files
-->
<property
file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create tables of test plugin compiles first -->
<antcall
......@@ -191,7 +191,7 @@
descriptions of zip types and log files
-->
<property
file="${buildDirectory}/maps/${env.RELENG}${env.DEP_DIR}/maps/dependencies.properties"/>
file="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
<!-- create table of test plugin compiles first -->
<!-- set isBuildTested to true for the "compile only" results -->
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent