From: Miro Richard Eklund <miro.eklund@semantum.fi>
Date: Mon, 3 Sep 2018 09:34:26 +0000 (+0300)
Subject: Add "steps" definition to stage 1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=d858d5f89cf193026c532eafad47fcf78ca214d6;p=simantics%2Fsysdyn.git

Add "steps" definition to stage 1

gitlab #28

Change-Id: I15a63f16f518982b96cae60d7302c6278243d629
---

diff --git a/releng/JenkinsFiles/Jenkinsfile-sysdyn-simupedia-om b/releng/JenkinsFiles/Jenkinsfile-sysdyn-simupedia-om
index 6db9cae2..cf2b754c 100644
--- a/releng/JenkinsFiles/Jenkinsfile-sysdyn-simupedia-om
+++ b/releng/JenkinsFiles/Jenkinsfile-sysdyn-simupedia-om
@@ -2,64 +2,66 @@ pipeline {
     agent { label 'master' }
     stages  {
         stage ('Build and possible publish product to web') {
-            bash '''#!/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"
-                /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"
-                /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"
-                /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"
-                /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
-
-                echo "Re-package as SimanticsSysdynSimupediaOM.product"
-                mv -v ${PKG} ${TGT}
-                7z a -tzip ${TGT}.zip ${TGT} > /dev/null
-                rm -rf ${PKG}.zip ${TGT}
-
-                if [ -n "${PUBLISH_PRODUCTS}" ]; then
-                    PRODUCT_PUBLISH_DIR=/var/www/http-www.simantics.org/download/${BRANCH}/sysdyn/products
-                    echo "Publishing product archives at: ${PRODUCT_PUBLISH_DIR}"
-                    mkdir -p ${PRODUCT_PUBLISH_DIR}
-                    rsync --stats --verbose --recursive --delete ${WORKSPACE}/*.zip ${PRODUCT_PUBLISH_DIR}
-                fi
-            '''
+            steps {
+                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"
+                    /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"
+                    /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"
+                    /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"
+                    /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
+    
+                    echo "Re-package as SimanticsSysdynSimupediaOM.product"
+                    mv -v ${PKG} ${TGT}
+                    7z a -tzip ${TGT}.zip ${TGT} > /dev/null
+                    rm -rf ${PKG}.zip ${TGT}
+    
+                    if [ -n "${PUBLISH_PRODUCTS}" ]; then
+                        PRODUCT_PUBLISH_DIR=/var/www/http-www.simantics.org/download/${BRANCH}/sysdyn/products
+                        echo "Publishing product archives at: ${PRODUCT_PUBLISH_DIR}"
+                        mkdir -p ${PRODUCT_PUBLISH_DIR}
+                        rsync --stats --verbose --recursive --delete ${WORKSPACE}/*.zip ${PRODUCT_PUBLISH_DIR}
+                    fi
+                '''
+            }
         }
     }
 }
\ No newline at end of file