misssprint

jenkinsfile.get.and.sync.dict

@@ -100,16 +100,16 @@ pipeline {
                         echo "Get dictionaries for $key"
                         get_ftp(value.dir, value.user, value.pass, FTP.HELIX, OPEN_CLUSTER, WGET_IMAGE)
                     }
-                    def dir = value.dir
-                    sh """printf '#!/bin/bash\ncd /root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$dir\n\
-                          exec "/usr/bin/xvfb-run" "-a" "wine" "/opt/syncserver/SyncServer.exe" "\$@"' > entrypoint.sh
-                          chmod +x entrypoint.sh
-                       """
                     HELIXNAMES.each { key, value -> 
                         if (value.idtask) {
                             container_operate(GOST_CLUSTER, [ 'sync' ])
                             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                 timeout(time: 10 as Integer, unit: 'MINUTES') {
+                                    def dir = value.dir
+                                    sh """printf '#!/bin/bash\ncd /root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$dir\n\
+                                          exec "/usr/bin/xvfb-run" "-a" "wine" "/opt/syncserver/SyncServer.exe" "\$@"' > entrypoint.sh
+                                          chmod +x entrypoint.sh
+                                       """
                                     echo "Syncing dictionaries for $key"
                                     def log_dir = value.dir.replace("Files", "LOGS")
                                     syncServer(log_dir, value.idtask, SYNC_SERVER_IMAGE, GOST_CLUSTER)
@@ -130,18 +130,18 @@ pipeline {
                         def log_dir = value.dir.replace("Files", "LOGS")
                         get_http(log_dir, value.id, ANALIS_IMAGE, TAG, GOST_CLUSTER)
                     }
-                    def dir = value.dir
-                    sh """printf '#!/bin/bash\ncd /root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$dir\n\
-                          cat \$(ls -1t InvitroGetExtendedProduct_*.xml | head -n1) > InvitroGetExtendedProduct.xml\n\
-                          cat \$(ls -1t InvitroGetInfo_*.xml | head -n1) > InvitroGetInfo.xml\n\
-                          exec "/usr/bin/xvfb-run" "-a" "wine" "/opt/syncserver/SyncServer.exe" "\$@"' > entrypoint.sh
-                          chmod +x entrypoint.sh
-                       """
                     INVITRONAMES.each { key, value -> 
                         if (value.idtask) {
                             container_operate(GOST_CLUSTER, [ 'sync' ])
                             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                 timeout(time: 10 as Integer, unit: 'MINUTES') {
+                                    def dir = value.dir
+                                    sh """printf '#!/bin/bash\ncd /root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$dir\n\
+                                          cat \$(ls -1t InvitroGetExtendedProduct_*.xml | head -n1) > InvitroGetExtendedProduct.xml\n\
+                                          cat \$(ls -1t InvitroGetInfo_*.xml | head -n1) > InvitroGetInfo.xml\n\
+                                          exec "/usr/bin/xvfb-run" "-a" "wine" "/opt/syncserver/SyncServer.exe" "\$@"' > entrypoint.sh
+                                          chmod +x entrypoint.sh
+                                       """
                                     echo "Syncing dictionaries for $key"
                                     def log_dir = value.dir.replace("Files", "LOGS")
                                     syncServer(log_dir, value.idtask, SYNC_SERVER_IMAGE, GOST_CLUSTER)
@@ -162,19 +162,21 @@ pipeline {
                         def log_dir = value.dir.replace("Files", "LOGS")
                         get_http(log_dir, value.id, ANALIS_IMAGE, TAG, GOST_CLUSTER)
                     }
-                    def dir = value.dir
-                    sh """printf '#!/bin/bash\ncd /root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$dir\n\
-                          cat \$(ls -1t AlfaLabDict_*.xml | head -n1) > AlfaLabDict.xml\n\
-                          exec "/usr/bin/xvfb-run" "-a" "wine" "/opt/syncserver/SyncServer.exe" "\$@"' > entrypoint.sh
-                          chmod +x entrypoint.sh
-                       """
-                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                        timeout(time: 10 as Integer, unit: 'MINUTES') {
-                            ALFANAMES.each { key, value -> 
-                                echo "Syncing $key"
-                                container_operate(GOST_CLUSTER, [ 'sync' ])
-                                def log_dir = value.dir.replace("Files", "LOGS")
-                                syncServer(log_dir, value.idtask, SYNC_SERVER_IMAGE, GOST_CLUSTER)
+                    ALFANAMES.each { key, value -> 
+                        if (value.idtask) {
+                            catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                                timeout(time: 10 as Integer, unit: 'MINUTES') {
+                                    def dir = value.dir
+                                    sh """printf '#!/bin/bash\ncd /root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$dir\n\
+                                          cat \$(ls -1t AlfaLabDict_*.xml | head -n1) > AlfaLabDict.xml\n\
+                                          exec "/usr/bin/xvfb-run" "-a" "wine" "/opt/syncserver/SyncServer.exe" "\$@"' > entrypoint.sh
+                                          chmod +x entrypoint.sh
+                                       """
+                                    echo "Syncing $key"
+                                    container_operate(GOST_CLUSTER, [ 'sync' ])
+                                    def log_dir = value.dir.replace("Files", "LOGS")
+                                    syncServer(log_dir, value.idtask, SYNC_SERVER_IMAGE, GOST_CLUSTER)
+                                }
                             }
                         }
                     }
@@ -186,7 +188,7 @@ pipeline {
                 script {
                     echo "Get dictionaries for Gemotest"
                     get_ftp(GEMOTEST.dir, GEMOTEST.user, GEMOTEST.pass, FTP.GEMOTEST, OPEN_CLUSTER, WGET_IMAGE)
-                    def dir = value.dir
+                    def dir = GEMOTEST.dir
                     sh """printf '#!/bin/bash\ncd /root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$dir\n\
                           exec "/usr/bin/xvfb-run" "-a" "wine" "/opt/syncserver/SyncServer.exe" "\$@"' > entrypoint.sh
                           chmod +x entrypoint.sh
@@ -207,7 +209,7 @@ pipeline {
                 script {
                     echo "Get dictionaries for CMD"
                     get_ftp(CMD.dir, CMD.user, CMD.pass, FTP.CMD, GOST_CLUSTER, WGET_IMAGE)
-                    def dir = value.dir
+                    def dir = CMD.dir
                     sh """printf '#!/bin/bash\ncd /root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$dir\n\
                           exec "/usr/bin/xvfb-run" "-a" "wine" "/opt/syncserver/SyncServer.exe" "\$@"' > entrypoint.sh
                           chmod +x entrypoint.sh