Browse Source

missprint

Владимир Томишинец 5 years ago
parent
commit
482d3a849a
1 changed files with 6 additions and 3 deletions
  1. 6 3
      jenkinsfile.get.and.sync.dict

+ 6 - 3
jenkinsfile.get.and.sync.dict

@@ -100,6 +100,7 @@ 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
@@ -129,6 +130,7 @@ 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\
@@ -142,7 +144,6 @@ pipeline {
                                 timeout(time: 10 as Integer, unit: 'MINUTES') {
                                     echo "Syncing dictionaries for $key"
                                     def log_dir = value.dir.replace("Files", "LOGS")
-                                    def dir = value.dir
                                     syncServer(log_dir, value.idtask, SYNC_SERVER_IMAGE, GOST_CLUSTER)
                                 }
                             }       
@@ -161,6 +162,7 @@ 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
@@ -172,7 +174,6 @@ pipeline {
                                 echo "Syncing $key"
                                 container_operate(GOST_CLUSTER, [ 'sync' ])
                                 def log_dir = value.dir.replace("Files", "LOGS")
-                                def dir = value.dir
                                 syncServer(log_dir, value.idtask, SYNC_SERVER_IMAGE, GOST_CLUSTER)
                             }
                         }
@@ -185,6 +186,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
                     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
@@ -204,7 +206,8 @@ pipeline {
             steps {
                 script {
                     echo "Get dictionaries for CMD"
-                    get_ftp(CMD.dir, CMD.user, CMD.pass, FTP.CMD, GOST_CLUSTER, WGET_IMAGE)  
+                    get_ftp(CMD.dir, CMD.user, CMD.pass, FTP.CMD, GOST_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