Fixing build to install correct IUs

gitlab #28

Change-Id: I479b13f6977e5bb3880a86ae2c14c8f81a70e1e7

diff --git a/releng/JenkinsFiles/Jenkinsfile-sysdyn-simupedia-om b/releng/JenkinsFiles/Jenkinsfile-sysdyn-simupedia-om
index cf2b754c17c0eff949ce3707edf46870cf922b1b..4c5b3c03ec46a99df9500de1f392447d21357efd 100644 (file)
--- a/releng/JenkinsFiles/Jenkinsfile-sysdyn-simupedia-om
+++ b/releng/JenkinsFiles/Jenkinsfile-sysdyn-simupedia-om
@@ -6,48 +6,48 @@ pipeline {
                 sh '''#!/bin/bash
                     PKG=Simantics-Desktop-win32.win32.x86_64
                     TGT=Simantics-Sysdyn-Simupedia-OM-win32.win32.x86_64
-    
+
                     echo "Download current desktop product"
                     wget -nv http://www.simantics.org/download/${BRANCH}/${PKG}.zip
-    
+
                     echo "Unzip Desktop product"
                     unzip -q -d ${PKG} ${PKG}.zip
-    
-                    echo "Install sysdyn feature into unzipped product"
+
+                    echo "Install Sysdyn feature into unzipped product"
                     /opt/eclipse/eclipse -noSplash \
-                            -application org.eclipse.equinox.p2.director \
-                            -repository http://www.simantics.org/download/${BRANCH}/sysdyn/p2.site/ \
-                            -installIU fi.semantum.simupedia.documentserver.feature \
-                            -tag AddSysdyn \
-                            -destination ${PKG} \
-                            -profile DefaultProfile
-    
-                    echo "Install simupedia documentserver feature into unzipped product"
+                        -application org.eclipse.equinox.p2.director \
+                        -repository https://www.simantics.org/download/${BRANCH}/sysdyn/p2.site/ \
+                        -installIU org.simantics.sysdyn.internal.p2.feature.group \
+                        -tag AddSysdyn \
+                        -destination ${PKG} \
+                        -profile DefaultProfile || exit -1
+
+                    echo "Install Simupedia DocumentServer feature into unzipped product"
                     /opt/eclipse/eclipse -noSplash \
-                            -application org.eclipse.equinox.p2.director \
-                            -repository https://www.simantics.org/update/simupedia/${BRANCH}/p2.site/ \
-                            -installIU fi.semantum.simupedia.documentserver.feature \
-                            -tag AddSimupediaSysdyn \
-                            -destination ${PKG} \
-                            -profile DefaultProfile
-            
-                    echo "Install simupedia documentserver feature into unzipped product"
+                        -application org.eclipse.equinox.p2.director \
+                        -repository https://www.simantics.org/update/simupedia/${BRANCH}/p2.site/ \
+                        -installIU fi.semantum.simupedia.documentserver.feature.feature.group \
+                        -tag AddSimupediaDocumentServer \
+                        -destination ${PKG} \
+                        -profile DefaultProfile || exit -1
+
+                    echo "Install Simupedia Sysdyn simulation feature into unzipped product"
                     /opt/eclipse/eclipse -noSplash \
-                            -application org.eclipse.equinox.p2.director \
-                            -repository https://www.simantics.org/update/simupedia-sysdyn/${BRANCH}/p2.site/ \
-                            -installIU fi.semantum.simupedia.simulation.sysdyn.feature \
-                            -tag AddSimupediaSimulationSysdyn} \
-                            -destination ${PKG} \
-                            -profile DefaultProfile
-    
-                    echo "Install open modelica"
+                        -application org.eclipse.equinox.p2.director \
+                        -repository https://www.simantics.org/update/simupedia-sysdyn/${BRANCH}/p2.site/ \
+                        -installIU fi.semantum.simupedia.simulation.sysdyn.feature.feature.group \
+                        -tag AddSimupediaSimulationSysdyn} \
+                        -destination ${PKG} \
+                        -profile DefaultProfile || exit -1
+
+                    echo "Install OpenModelica"
                     /opt/eclipse/eclipse -noSplash \
-                            -application org.eclipse.equinox.p2.director \
-                            -repository http://www.simantics.org/download/master/openmodelica/p2.site/ \
-                            -installIU org.simantics.om.feature \
-                            -tag AddOpenModelica \
-                            -destination ${PKG} \
-                            -profile DefaultProfile
+                        -application org.eclipse.equinox.p2.director \
+                        -repository https://www.simantics.org/download/master/openmodelica/p2.site/ \
+                        -installIU org.simantics.om.feature.group \
+                        -tag AddOpenModelica \
+                        -destination ${PKG} \
+                        -profile DefaultProfile || exit -1
     
                     echo "Re-package as SimanticsSysdynSimupediaOM.product"
                     mv -v ${PKG} ${TGT}