Fix predefined update sites (#29)

* update of the predefined updatesite urls used * removed some unused/outdated url (greclipse, capella) * update for neon->oxygen * use .product instead of .inf in order to set predefined update sites * remove deprecated json file was used when the build was split in several build jobs, now we have one big job Signed-off-by: dvojtise <[email protected]>
eclipse-gemoc · Oct 24, 2017 · 2c13579 · 2c13579
1 parent f2ee800
commit 2c13579
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 288 deletions.
diff --git a/dev_support/ci_support/targetplatform/.project b/dev_support/ci_support/targetplatform/.project
diff --git a/dev_support/ci_support/targetplatform/b3aggrtojson.py b/dev_support/ci_support/targetplatform/b3aggrtojson.py
diff --git a/dev_support/ci_support/targetplatform/configure_jenkinsgit4sparsecheckout.sh b/dev_support/ci_support/targetplatform/configure_jenkinsgit4sparsecheckout.sh
diff --git a/dev_support/ci_support/targetplatform/redirects.py b/dev_support/ci_support/targetplatform/redirects.py
diff --git a/dev_support/ci_support/targetplatform/sites.json b/dev_support/ci_support/targetplatform/sites.json
diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.p2.inf b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.p2.inf
@@ -1,26 +1,4 @@
 instructions.configure=\
-addRepository(type:0,location:http${#58}//download.eclipse.org/releases/neon,name:Neon);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/releases/neon,name:Neon);\
-addRepository(type:0,location:http${#58}//timesquare.inria.fr/ecl/update_site/neon,name:Timesquare ECL);\
-addRepository(type:1,location:http${#58}//timesquare.inria.fr/ecl/update_site/neon,name:Timesquare ECL);\
-addRepository(type:0,location:http${#58}//timesquare.inria.fr/update_site/neon,name:Timesquare);\
-addRepository(type:1,location:http${#58}//timesquare.inria.fr/update_site/neon,name:Timesquare);\
-addRepository(type:0,location:http${#58}//melange-lang.org/updatesite/,name:Melange);\
-addRepository(type:1,location:http${#58}//melange-lang.org/updatesite/,name:Melange);\
-addRepository(type:0,location:http${#58}//gemoc.org/updatesite/studio_nightly/,name:All Gemoc components - nightly);\
-addRepository(type:1,location:http${#58}//gemoc.org/updatesite/studio_nightly/,name:All Gemoc components - nightly);\
-addRepository(type:0,location:https${#58}//hudson.polarsys.org/kitalpha/job/Kitalpha_Nightly/380/artifact/result/publish/kitalpha/site.p2/,name:KitAlpha);\
-addRepository(type:1,location:https${#58}//hudson.polarsys.org/kitalpha/job/Kitalpha_Nightly/380/artifact/result/publish/kitalpha/site.p2/,name:KitAlpha);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/diffmerge/releases/0.4.0/emf-diffmerge-site,name:DiffMerge 0.4.0);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/diffmerge/releases/0.4.0/emf-diffmerge-site,name:DiffMerge 0.4.0);\
-addRepository(type:0,location:https${#58}//hudson.polarsys.org/capella/job/capella-gerrit/113/artifact/result/publish/org.polarsys.capella/site.p2/,name:Capella for luna);\
-addRepository(type:1,location:https${#58}//hudson.polarsys.org/capella/job/capella-gerrit/113/artifact/result/publish/org.polarsys.capella/site.p2/,name:Capella for luna);\
-addRepository(type:0,location:http${#58}//download.eclipse.org/technology/nebula/archives/Q42015/incubation,name:Nebula incubation);\
-addRepository(type:1,location:http${#58}//download.eclipse.org/technology/nebula/archives/Q42015/incubation,name:Nebula incubation);\
-addRepository(type:0,location:http${#58}//gemoc.org/pub/studio/patch_sirius_palette/,name:Patch For Sirius (enabling animation));\
-addRepository(type:1,location:http${#58}//gemoc.org/pub/studio/patch_sirius_palette/,name:Patch For Sirius (enabling animation));\
-addRepository(type:0,location:http${#58}//dist.springsource.org/snapshot/GRECLIPSE/e4.5/,name:Greclipse);\
-addRepository(type:1,location:http${#58}//dist.springsource.org/snapshot/GRECLIPSE/e4.5/,name:Greclipse);\
   mkdir(path:${installFolder}/dropins);
 
 requires.1.namespace=org.eclipse.equinox.p2.iu

diff --git a/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.product b/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.product/gemoc_studio.product
@@ -48,14 +48,12 @@
       </win>
    </launcher>
 
-
    <vm>
       <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
       <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
    </vm>
 
-
    <plugins>
    </plugins>
 
@@ -79,9 +77,9 @@
       <repository location="http://timesquare.inria.fr/update_site/neon" enabled="false" />
       <repository location="http://melange-lang.org/updatesite/" enabled="true" />
       <repository location="http://archive.eclipse.org/nebula/Q22016/incubation" enabled="true" />
-      <repository location="http://www.kermeta.org/k3/update/" enabled="true" />
-      <repository location="http://ci.eclipse.org/gemoc/job/gemoc-studio/job/eclipse-oxygen/lastSuccessfulBuild/artifact/gemoc-studio/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.updatesite/target/repository/" enabled="true" />
       <repository location="http://download.eclipse.org/releases/oxygen" enabled="true" />
+      <repository location="http://www.kermeta.org/k3/update/" enabled="true" />
+      <repository location="http://ci.eclipse.org/gemoc/job/gemoc-studio/job/master/lastSuccessfulBuild/artifact/gemoc-studio/gemoc_studio/releng/org.eclipse.gemoc.gemoc_studio.updatesite/target/repository/" enabled="true" />
    </repositories>
 
    <preferencesInfo>