Yet another attempt at sysdyn setup pipeline

gitlab #34

(cherry picked from commit 9fb4ade0e72f331ead7e1d863b12c7d0d58e90c8)

diff --git a/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup b/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
index f3b2090d12cdd3edbea80c146d59d80cbd12b7e4..3fde558b2f719c55eebf3e0e00492fa5f661863a 100644 (file)
--- a/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
+++ b/releng/JenkinsFiles/Jenkinsfile-sysdyn-setup
@@ -6,10 +6,11 @@ pipeline {
             steps {
                 powershell '''
                     $ProgressPreference = "silentlyContinue"
+                    rm -Recurse releng/inno-setup/sysdyn releng/inno-setup/output
                     wget "http://www.simantics.org/download/${Env:BRANCH}/sysdyn/products/Simantics-Sysdyn-win32.win32.x86_64.zip" -OutFile sysdyn.zip
                     Expand-Archive ./sysdyn.zip -DestinationPath releng/inno-setup/sysdyn
-                    robocopy /MIR C:/jenkins/jre8/win32.x86_64 releng/inno-setup/sysdyn/jre
-                    iscc releng/inno-setup/sysdyn.iss
+                    robocopy /MIR /NFL /NDL /NP C:/jenkins/jre8/win32.x86_64 releng/inno-setup/sysdyn/jre
+                    iscc /Q releng/inno-setup/sysdyn.iss
                 '''
                 archiveArtifacts artifacts: 'releng/inno-setup/output/*.exe', fingerprint: false
             }
@@ -19,25 +20,16 @@ pipeline {
             steps {
                 powershell '''
                     $ProgressPreference = "silentlyContinue"
-                    wget "http://www.simantics.org/download/${Env:BRANCH}/sysdyn/products/Simantics-Sysdyn-OM-win32.win32.x86_64.zip" -OutFile sysdyn.zip
-                    Expand-Archive ./sysdyn.zip -DestinationPath releng/inno-setup/sysdyn
-                    robocopy /MIR C:/jenkins/jre8/win32.x86_64 releng/inno-setup/sysdyn/jre
-                    iscc releng/inno-setup/sysdyn.iss
+                    rm -Recurse releng/inno-setup/sysdyn
+                    rm -Recurse releng/inno-setup/output
+                    wget "http://www.simantics.org/download/${Env:BRANCH}/sysdyn/products/Simantics-Sysdyn-OM-win32.win32.x86_64.zip" -OutFile sysdyn-om.zip
+                    Expand-Archive ./sysdyn-om.zip -DestinationPath releng/inno-setup/sysdyn
+                    robocopy /MIR /NFL /NDL /NP C:/jenkins/jre8/win32.x86_64 releng/inno-setup/sysdyn/jre
+                    iscc /Q releng/inno-setup/sysdyn.iss
                     move releng/inno-setup/output/Sysdyn-1.35.0.exe releng/inno-setup/output/Sysdyn-OM-1.35.0.exe
                 '''
                 archiveArtifacts artifacts: 'releng/inno-setup/output/*.exe', fingerprint: false
             }
         }
-        stage ('Publish installers') {
-            agent { label 'master' }
-            steps {
-                sh '''#!/bin/bash
-                    PRODUCT_PUBLISH_DIR=/var/www/http-www.simantics.org/download/${BRANCH}/sysdyn/products
-                    echo "Publishing installers at: ${PRODUCT_PUBLISH_DIR}"
-                    mkdir -p ${PRODUCT_PUBLISH_DIR}
-                    #rsync --stats --verbose ${WORKSPACE}/*.exe ${PRODUCT_PUBLISH_DIR}
-                '''
-            }
-        }
     }
 }