Browse Source

test INVITRO

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

+ 15 - 16
jenkinsfile.get.and.sync.dict

@@ -39,9 +39,9 @@ def HELIXNAMES = [
 */]
 def INVITRONAMES = [ 
     labMSK: [ id: '990010000000002', idtask: '990010000000002', dir: 'InvitroMSK/Files/Dictionaries' ],
-    labCHLB: [ id: '990010000000043', idtask: '990010000000032', dir: 'InvitroCHLB/Files/Dictionaries' ],
-    labSMR: [ id: '990010000000041', idtask: '990010000000031', dir: 'InvitroSMR/Files/Dictionaries' ],
-    labSPB: [ id: '990010000000042', idtask: '990010000000030', dir: 'InvitroSPB/Files/Dictionaries' ]
+//    labCHLB: [ id: '990010000000043', idtask: '990010000000032', dir: 'InvitroCHLB/Files/Dictionaries' ],
+//    labSMR: [ id: '990010000000041', idtask: '990010000000031', dir: 'InvitroSMR/Files/Dictionaries' ],
+//    labSPB: [ id: '990010000000042', idtask: '990010000000030', dir: 'InvitroSPB/Files/Dictionaries' ]
 //    labNSB: [ id: '990010000000033', idtask: '990010000000033', dir: 'InvitroNSB/Files/Dictionaries' ]
 ]
 def ALFANAMES = [ 
@@ -113,7 +113,7 @@ pipeline {
                 }
             } 
         }
-        stage ("INVITRO dictionaries") {
+*/        stage ("INVITRO dictionaries") {
             steps {
                 script {
                     INVITRONAMES.each { key, value ->
@@ -130,7 +130,7 @@ pipeline {
                             -v analis-wineservice_analis_Files_netapp:/root/.wine/dosdevices/unc/samba.infoclinica.lan/smartdelta01 \
                             --network=labnetwork -e DEBUG=false \
                             -e LOGPATH=/root/.wine/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$log_dir \
-                            ${ANALIS_IMAGE} -SyncRefInterval=1 LabSystems=$value.id /nocycles
+                            ${ANALIS_IMAGE} SyncRefInterval=1 LabSystems=$value.id /nocycles
                           docker cp infodent.ini get:/opt/analis/infodent.ini
                           docker cp analis.conf get:/opt/analis/analis.conf
                           docker start -i get
@@ -138,15 +138,16 @@ pipeline {
                        """
                     echo "Syncing $key"
                     log_dir = log_dir.replace("/", "\\")
-                    sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1
+                    def CLUSTER_GOST = CLUSTER.gost
+                    sh """export DOCKER_HOST=tcp://$CLUSTER_GOST:2376 DOCKER_TLS_VERIFY=1
                           docker create -i --name sync \
-                            -v analis-wineservice_analis_Files_netapp:/root/wine32/drive_c/services/analis \
-                            --network=labnetwork --entrypoint='' ${SYNC_IMAGE} /bin/bash \
-                            -c 'cd /root/wine32/drive_c/services/analis/$value.dir; \
-                            cat $(ls -1t InvitroGetExtendedProduct_*.xml | head -n1) > InvitroGetExtendedProduct.xml; \
-                            cat $(ls -1t InvitroGetInfo_*.xml | head -n1) > InvitroGetInfo.xml; \
+                            -v analis-wineservice_analis_Files_netapp:/root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/ \
+                            --network=labnetwork --entrypoint='' \${SYNC_IMAGE} /bin/bash \
+                            -c 'cd /root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$value.dir; \
+                            cat \$(ls -1t InvitroGetExtendedProduct_*.xml | head -n1) > InvitroGetExtendedProduct.xml; \
+                            cat \$(ls -1t InvitroGetInfo_*.xml | head -n1) > InvitroGetInfo.xml; \
                             /usr/bin/xvfb-run -a wine /opt/syncmanager/SyncManager.exe -a prod_lab -e "$value.idtask" \
-                            -logfile "C:\Services\Analis\$log_dir\syncmanager_#.log" '
+                            -logfile "\\\\\\samba.infoclinica.lan\\smartdelta01\\$log_dir\\syncmanager_#.log" '
                           docker cp infodent.ini sync:/opt/syncmanager/infodent.ini
                           docker start -i sync
                           docker rm sync
@@ -155,7 +156,7 @@ pipeline {
                 }
             }
         }
-*//*Работает. Не трогать!
+/*Работает. Не трогать!
         stage ("ALFA dictionaries") {
             steps {
                 script {
@@ -199,7 +200,7 @@ pipeline {
                 }
             }
         }
-*/        stage ("Gemotest dictionaries") {
+        stage ("Gemotest dictionaries") {
             steps {
                 script {
                     echo "Get dictionaries for Gemotest"
@@ -224,8 +225,6 @@ pipeline {
                 }
             }
         }
-
-/*  Работает, не трогать!
         stage ("CMD dictionaries") {
             steps {
                 script {