Bug 502480: Pin build system to Papyrus Neon.1 release
Add the option in the tester setup to pick Papyrus milestone
or release builds instead of the nightly. The nightly build
is the default for continuity.
Change-Id: I16339e734aa0da11dc4c134b8ff448d04eabd4e5
diff --git a/content/setup/papyrus-rt-developer.setup b/content/setup/papyrus-rt-developer.setup
index ca56f25..f5dc0cd 100644
--- a/content/setup/papyrus-rt-developer.setup
+++ b/content/setup/papyrus-rt-developer.setup
@@ -92,6 +92,22 @@
defaultValue="Neon"
storageURI="scope://Workspace"/>
<setupTask
+ xsi:type="setup:VariableTask"
+ name="papyrus.buildtype"
+ defaultValue="nightly"
+ storageURI="scope://Workspace">
+ <choice
+ value="nightly"
+ label="Nightly Builds (bleeding edge)"/>
+ <choice
+ value="milestones"
+ label="Milestone Builds (more stable)"/>
+ <choice
+ value="releases"
+ label="Release Builds (most stable)"/>
+ <description>The kind of Papyrus build (stability level) to include in the configuration.</description>
+ </setupTask>
+ <setupTask
xsi:type="setup:EclipseIniTask"
option="-Xmx"
value="2048m"
@@ -236,7 +252,9 @@
<repositoryList
name="Neon">
<repository
- url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/neon"/>
+ url="${base.downloads.url}/modeling/mdt/papyrus/updates/${papyrus.buildtype}/neon/main/"/>
+ <repository
+ url="${base.downloads.url}/modeling/mdt/papyrus/updates/${papyrus.buildtype}/neon/extra/"/>
<repository
url="${base.downloads.url}/tools/cdt/builds/neon/milestones/"/>
<repository
@@ -256,10 +274,6 @@
<repository
url="https://hudson.eclipse.org/papyrus/job/Papyrus-Neon-Developer/lastSuccessfulBuild/artifact/repository"/>
<repository
- url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/neon/extra/"/>
- <repository
- url="https://hudson.eclipse.org/papyrus/job/Papyrus-Neon-Extra/lastSuccessfulBuild/artifact/repository"/>
- <repository
url="${base.downloads.url}/elk/updates/releases/0.1.0/"/>
</repositoryList>
</targlet>
@@ -945,14 +959,7 @@
</setupTask>
<stream
name="master"
- label="master (Neon/1.0)">
- <setupTask
- xsi:type="setup.p2:P2Task">
- <repository
- url="${base.downloads.url}/modeling/mdt/papyrus/updates/releases/neon/"/>
- <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
- </setupTask>
- </stream>
+ label="master (Neon/1.0)"/>
<description>Plug-ins for migration of models from other tools.</description>
</project>
<project name="releng"
@@ -1185,7 +1192,7 @@
<repository
url="${base.downloads.url}/papyrus-rt/updates/nightly/neon/"/>
<repository
- url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/neon/"/>
+ url="${base.downloads.url}/modeling/mdt/papyrus/updates/${papyrus.buildtype}/neon/"/>
</setupTask>
</stream>
<logicalProjectContainer
diff --git a/content/setup/papyrus-rt-tester.setup b/content/setup/papyrus-rt-tester.setup
index f5a2ef0..57836e2 100644
--- a/content/setup/papyrus-rt-tester.setup
+++ b/content/setup/papyrus-rt-tester.setup
@@ -101,6 +101,22 @@
name="eclipse.target.platform"
defaultValue="Neon"
storageURI="scope://Workspace"/>
+ <setupTask
+ xsi:type="setup:VariableTask"
+ name="papyrus.buildtype"
+ defaultValue="nightly"
+ storageURI="scope://Installation">
+ <choice
+ value="nightly"
+ label="Nightly Builds (bleeding edge)"/>
+ <choice
+ value="milestones"
+ label="Milestone Builds (more stable)"/>
+ <choice
+ value="releases"
+ label="Release Builds (most stable)"/>
+ <description>The kind of Papyrus build (stability level) to include in the configuration.</description>
+ </setupTask>
<version name="latest"
label="Latest Successful Build for testers - USE AT YOUR OWN RISK!"
requiredJavaVersion="1.7">
@@ -132,7 +148,9 @@
<repository
url="${base.downloads.url}/papyrus-rt/updates/nightly/neon/"/>
<repository
- url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/neon"/>
+ url="${base.downloads.url}/modeling/mdt/papyrus/updates/${papyrus.buildtype}/neon/main/"/>
+ <repository
+ url="${base.downloads.url}/modeling/mdt/papyrus/updates/${papyrus.buildtype}/neon/extra/"/>
<repository
url="${base.downloads.url}/tools/cdt/releases/9.0"/>
<repository
@@ -150,10 +168,6 @@
<repository
url="http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly"/>
<repository
- url="${base.downloads.url}/modeling/mdt/papyrus/updates/nightly/neon/extra/"/>
- <repository
- url="https://hudson.eclipse.org/papyrus/job/Papyrus-Neon-Extra/lastSuccessfulBuild/artifact/repository"/>
- <repository
url="${base.downloads.url}/elk/updates/releases/0.1.0/"/>
</setupTask>
<description>Papyrus-RT Latest Successful Build for testers - USE AT YOUR OWN RISK!</description>
