Merge "[releng] update oxygen job"
diff --git a/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/buckminster_BuildStep_10/build.rmap b/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/buckminster_BuildStep_10/build.rmap
index e99932f..8478918 100644
--- a/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/buckminster_BuildStep_10/build.rmap
+++ b/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/buckminster_BuildStep_10/build.rmap
@@ -26,6 +26,34 @@
<searchPath name="BuildStep_10_GITBuildLocation_1">
<!-- provider for windows if checkouted with Hudson -->
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="local" source="true">
+ <uri format="file:/{0}/git/git_eclipse/deprecated/4.7/portfolio/{1}">
+ <bc:propertyRef key="build.root" />
+ <bc:propertyRef key="buckminster.component" />
+ </uri>
+ </provider>
+ <!-- provider for unix if checkouted with Hudson -->
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="local" source="true">
+ <uri format="file://{0}/git/git_eclipse/deprecated/4.7/portfolio/{1}">
+ <bc:propertyRef key="build.root" />
+ <bc:propertyRef key="buckminster.component" />
+ </uri>
+ </provider>
+ <!-- standalone provider -->
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="git" source="true">
+ <property key="git.remote.uri" value="https://:@git.eclipse.org/r/egf/org.eclipse.emf.egf"/>
+ <property key="git.auto.fetch" value="true"/>
+ <uri format="{0}/git,deprecated/4.7/portfolio/{1}">
+ <bc:propertyRef key="build.root" />
+ <bc:propertyRef key="buckminster.component" />
+ </uri>
+ </provider>
+ </searchPath>
+
+
+ <locator searchPathRef="BuildStep_10_GITBuildLocation_2" pattern="^org\.eclipse\.egf.*" failOnError="false" />
+ <searchPath name="BuildStep_10_GITBuildLocation_2">
+ <!-- provider for windows if checkouted with Hudson -->
+ <provider componentTypes="eclipse.feature,osgi.bundle" readerType="local" source="true">
<uri format="file:/{0}/git/git_eclipse/plugins/{1}">
<bc:propertyRef key="build.root" />
<bc:propertyRef key="buckminster.component" />
@@ -50,8 +78,8 @@
</searchPath>
- <locator searchPathRef="BuildStep_10_GITBuildLocation_2" pattern="^org\.eclipse\.egf.*" failOnError="false" />
- <searchPath name="BuildStep_10_GITBuildLocation_2">
+ <locator searchPathRef="BuildStep_10_GITBuildLocation_3" pattern="^org\.eclipse\.egf.*" failOnError="false" />
+ <searchPath name="BuildStep_10_GITBuildLocation_3">
<!-- provider for windows if checkouted with Hudson -->
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="local" source="true">
<uri format="file:/{0}/git/git_eclipse/doc/{1}">
@@ -78,8 +106,8 @@
</searchPath>
- <locator searchPathRef="BuildStep_10_GITBuildLocation_3" pattern="^org\.eclipse\.egf.*" failOnError="false" />
- <searchPath name="BuildStep_10_GITBuildLocation_3">
+ <locator searchPathRef="BuildStep_10_GITBuildLocation_4" pattern="^org\.eclipse\.egf.*" failOnError="false" />
+ <searchPath name="BuildStep_10_GITBuildLocation_4">
<!-- provider for windows if checkouted with Hudson -->
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="local" source="true">
<uri format="file:/{0}/git/git_eclipse/examples/workspace/{1}">
@@ -106,8 +134,8 @@
</searchPath>
- <locator searchPathRef="BuildStep_10_GITBuildLocation_4" pattern="^org\.eclipse\.egf.*" failOnError="false" />
- <searchPath name="BuildStep_10_GITBuildLocation_4">
+ <locator searchPathRef="BuildStep_10_GITBuildLocation_5" pattern="^org\.eclipse\.egf.*" failOnError="false" />
+ <searchPath name="BuildStep_10_GITBuildLocation_5">
<!-- provider for windows if checkouted with Hudson -->
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="local" source="true">
<uri format="file:/{0}/git/git_eclipse/features/{1}.feature">
@@ -134,8 +162,8 @@
</searchPath>
- <locator searchPathRef="BuildStep_10_GITBuildLocation_5" pattern="^org\.eclipse\.egf.*" failOnError="false" />
- <searchPath name="BuildStep_10_GITBuildLocation_5">
+ <locator searchPathRef="BuildStep_10_GITBuildLocation_6" pattern="^org\.eclipse\.egf.*" failOnError="false" />
+ <searchPath name="BuildStep_10_GITBuildLocation_6">
<!-- provider for windows if checkouted with Hudson -->
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="local" source="true">
<uri format="file:/{0}/git/git_eclipse/portfolio/{1}">
@@ -162,8 +190,8 @@
</searchPath>
- <locator searchPathRef="BuildStep_10_GITBuildLocation_6" pattern="^org\.eclipse\.egf.*" failOnError="false" />
- <searchPath name="BuildStep_10_GITBuildLocation_6">
+ <locator searchPathRef="BuildStep_10_GITBuildLocation_7" pattern="^org\.eclipse\.egf.*" failOnError="false" />
+ <searchPath name="BuildStep_10_GITBuildLocation_7">
<!-- provider for windows if checkouted with Hudson -->
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="local" source="true">
<uri format="file:/{0}/git/git_eclipse/tests/{1}">
@@ -190,8 +218,8 @@
</searchPath>
- <locator searchPathRef="BuildStep_10_GITBuildLocation_7" pattern="^org\.eclipse\.egf.*" failOnError="false" />
- <searchPath name="BuildStep_10_GITBuildLocation_7">
+ <locator searchPathRef="BuildStep_10_GITBuildLocation_8" pattern="^org\.eclipse\.egf.*" failOnError="false" />
+ <searchPath name="BuildStep_10_GITBuildLocation_8">
<!-- provider for windows if checkouted with Hudson -->
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="local" source="true">
<uri format="file:/{0}/git/git_eclipse/releng/{1}">
@@ -218,8 +246,8 @@
</searchPath>
- <locator searchPathRef="BuildStep_10_UpdateSiteBuildLocation_8" failOnError="false" />
- <searchPath name="BuildStep_10_UpdateSiteBuildLocation_8">
+ <locator searchPathRef="BuildStep_10_UpdateSiteBuildLocation_9" failOnError="false" />
+ <searchPath name="BuildStep_10_UpdateSiteBuildLocation_9">
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
<uri format="{0}">
<bc:replace>
@@ -231,8 +259,8 @@
</searchPath>
- <locator searchPathRef="BuildStep_10_UpdateSiteBuildLocation_9" failOnError="false" />
- <searchPath name="BuildStep_10_UpdateSiteBuildLocation_9">
+ <locator searchPathRef="BuildStep_10_UpdateSiteBuildLocation_10" failOnError="false" />
+ <searchPath name="BuildStep_10_UpdateSiteBuildLocation_10">
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
<uri format="{0}">
<bc:replace>
@@ -244,8 +272,8 @@
</searchPath>
- <locator searchPathRef="BuildStep_10_UpdateSiteBuildLocation_10" pattern="^" failOnError="false" />
- <searchPath name="BuildStep_10_UpdateSiteBuildLocation_10">
+ <locator searchPathRef="BuildStep_10_UpdateSiteBuildLocation_11" pattern="^" failOnError="false" />
+ <searchPath name="BuildStep_10_UpdateSiteBuildLocation_11">
<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
<uri format="{0}">
<bc:replace>
diff --git a/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/build.xml b/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/build.xml
index 3c9f225..26040af 100644
--- a/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/build.xml
+++ b/releng/org.eclipse.egf.releng2/jobs/buckminster-egf-oxygen/releng/build.xml
@@ -605,11 +605,11 @@
</target>
<target name="TestStep_13" depends="init,install.buckminster">
- <echo message="Running Junit tests -> disabled" />
- </target>
+ <echo message="Running Junit tests " />
+ </target>
<target name="TestStep_14" depends="init,install.buckminster">
- <echo message="Running Junit tests -> disabled" />
+ <echo message="Running Junit tests " />
</target>
diff --git a/releng/org.eclipse.egf.releng2/model/buckminster-egf-oxygen.egfbuild b/releng/org.eclipse.egf.releng2/model/buckminster-egf-oxygen.egfbuild
index d3096b5..7e4a243 100644
--- a/releng/org.eclipse.egf.releng2/model/buckminster-egf-oxygen.egfbuild
+++ b/releng/org.eclipse.egf.releng2/model/buckminster-egf-oxygen.egfbuild
@@ -32,6 +32,7 @@
<steps xsi:type="buildstep:AntStep" xmi:id="_bfnpIAF9EeGO5KzPHjNKFQ" targetName="copy_egf_to_tools" xml="<target name="copy_egf_to_tools">
	<delete dir="${tools}/egf"/>
	<copy todir="${tools}/egf">
		<fileset dir="${publish}/egf"/>
	</copy>
</target>"/>
<steps xsi:type="buildstep:CleanStep" xmi:id="_Y0Q2IAF9EeGO5KzPHjNKFQ" type="Result"/>
<steps xsi:type="buildstep:BuildStep" xmi:id="_VP8DASR_EeCpI_U_Er6QNA" noBuildersInvocation="true">
+ <buildLocations xsi:type="buildscm:GITBuildLocation" xmi:id="_HWO8oELwEeijnvDjjPeOdw" pattern="org.eclipse.egf*" gitLocation="_VP8DGSR_EeCpI_U_Er6QNA" folderName="deprecated/4.7/portfolio"/>
<buildLocations xsi:type="buildscm:GITBuildLocation" xmi:id="_VP8DAiR_EeCpI_U_Er6QNA" pattern="org.eclipse.egf*" suffix="" gitLocation="_VP8DGSR_EeCpI_U_Er6QNA" folderName="plugins"/>
<buildLocations xsi:type="buildscm:GITBuildLocation" xmi:id="_VP8DBCR_EeCpI_U_Er6QNA" pattern="org.eclipse.egf*" gitLocation="_VP8DGSR_EeCpI_U_Er6QNA" folderName="doc"/>
<buildLocations xsi:type="buildscm:GITBuildLocation" xmi:id="_VP8DBSR_EeCpI_U_Er6QNA" pattern="org.eclipse.egf*" gitLocation="_VP8DGSR_EeCpI_U_Er6QNA" folderName="examples/workspace"/>
