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

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

@@ -167,13 +167,14 @@ pipeline {
                                 echo "Syncing $key"
                                 container_operate(GOST_CLUSTER, [ 'sync' ])
                                 def log_dir = value.dir.replace("Files", "LOGS")
-                                log_dir = log_dir.replace("/", "\\")
+//                                log_dir = log_dir.replace("/", "\\")
                                 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
                                       cat entrypoint.sh"""
+                                syncServer(log_dir, value.idtask, SYNC_SERVER_IMAGE, GOST_CLUSTER)
 /*                                sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
                                       docker create -i --name sync \
                                         -v analis-wineservice_analis_Files_netapp:/root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/ \
@@ -266,6 +267,7 @@ def syncServer(String dir, String idtask, String IMAGE, String CLUSTER) {
                 logpath=/root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$dir /nocycles
               docker cp infodent.ini sync:/opt/syncserver
               docker cp sync.conf sync:/opt/syncserver
+              docker cp entrypoint.sh sync:/opt
               docker start -i sync
               docker rm sync
            """