Владимир Томишинец 5 lat temu
rodzic
commit
a99a2ea9d4
1 zmienionych plików z 55 dodań i 54 usunięć
  1. 55 54
      jenkinsfile.get.and.sync.dict

+ 55 - 54
jenkinsfile.get.and.sync.dict

@@ -5,56 +5,56 @@ def FTP = [
     gemotest: 'ftp://ftp.gemotest.ru/services/*'
     ]
 def HELIXNAMES = [
-    labMSK: [ id: '990010000000015', dir: 'HelixMSK/Files/Dictionaries', user: 'TestDictMsk', pass: 'kO3R20eK' ],
-    labSPB: [ id: '990010000000013', dir: 'HelixSPB/Files/Dictionaries', user: 'TestDictSpb', pass: '8686Giq0' ],
-    labNSB: [ id: '990010000000029', dir: 'HelixNSB/Files/Dictionaries', user: 'TestDictNvsb', pass: '511bLPm3' ],
-    labPNZ: [ id: '990010000000046', dir: 'HelixPNZ/Files/Dictionaries', user: 'TestDictPnz', pass: 'IgK~66Ff' ],
-    labEKB: [ id: '990010000000044', dir: 'HelixEKB/Files/Dictionaries', user: 'TestDictEkb', pass: 'Fp5LMnKW' ],
-    labNSK: [ id: '990010000000045', dir: 'HelixNSK/Files/Dictionaries', user: 'TestDictNor', pass: 'jq9xd6sY' ],
-    labHBR: [ id: '990010000000047', dir: 'HelixHBR/Files/Dictionaries', user: 'TestDictHab', pass: 'idTf4WkE' ],
-    clinicRAN: [ id: '990010000001898', dir: 'HelixSPB/Files/Dictionaries/RAN', user: 'ran', pass: '7vFal2JBsC' ],
-    clinicONA: [ id: '990010000004936', dir: 'HelixSPB/Files/Dictionaries/ONA', user: 'ona', pass: 'svn2CD3KkL' ],
-    clinicBaltMed: [ id: '990010000002030', dir: 'HelixSPB/Files/Dictionaries/BaltMed', user: 'SpbMServ', pass: '1tMi8jRz' ],
-//    clinicSPom: [ id: '990010000013379', dir: 'HelixSPB/Files/Dictionaries/SkorayaPom', user: 'SpbSkorayaPom', pass: '8$c%%Vo46' ],
-    clinicMedlux: [ id: '990010000013413', dir: 'HelixMSK/Files/Dictionaries/Medlux_mostfarm', user: 'MskMedlux', pass: 'Zn8hede7' ],
-    clinicAskona: [ id: '990010000004940', dir: 'HelixMSK/Files/Dictionaries/Askona', user: 'MskPMK', pass: 'QdFQIF68' ],
-    clinicDR: [ id: '990010000002008', dir: 'HelixMSK/Files/Dictionaries/DR', user: 'MskDoctorRyadom', pass: 'iqBn0gIa' ],
-    clinicBZ: [ id: '990010000001881', dir: 'HelixMSK/Files/Dictionaries/BZ', user: 'MskClinicLMS', pass: '1npZfzex' ],
-//    clinicTemp: [ id: '990010000013661', dir: 'HelixMSK/Files/Dictionaries/Temp', user: 'MskTemp', pass: 'Hoch9is%%' ],
-//    clinicBZ_EKB: [ id: '990010000013445', dir: 'HelixEKB/Files/Dictionaries/BZ_Ekb', user: 'EkbBudZdorov', pass: '0Qk^&8Ko%%' ],
-    clinicSova: [ id: '990010000004941', dir: 'HelixMSK/Files/Dictionaries/Sova', user: 'MskSova', pass: 'ehCPz9mx' ],
-    clinicProfMed: [ id: '990010000004939', dir: 'HelixNSB/Files/Dictionaries/ProfMed', user: 'SpbProfMedUfa', pass: 'djZ6rA1T' ],
-    clinicMedisPlus: [ id: '990010000013458', dir: 'HelixNSB/Files/Dictionaries/MedisPlusKlinika', user: 'SpbKlinikaPskov', pass: '@3Sj*7St' ],
-    clinicMotherhood: [ id: '990010000013673', dir: 'HelixPNZ/Files/Dictionaries/Materinstvoidetstvo', user: 'MskMaterinstvoIDetst', pass: 'ZCPuzbw8' ]
-/*    clinicMskDomNaTverskoy: [ id: '990010000013837', dir: 'HelixMSK/Files/Dictionaries/DomNaTverskoy', user: 'MskDomNaTverskoy', pass: '83gQlPPL' ],
-    clinicMskProfMedLab: [ id: '990010000013850', dir: 'HelixMSK/Files/Dictionaries/profmedlab', user: 'MskProfMedLab', pass: 'The)ais3' ],
-    clinicRGSU: [ id: '990010000013852', dir: 'HelixMSK/Files/Dictionaries/RGSU', user: 'MskRGSU', pass: 'TPnYb3OT' ],
-    clinicISH: [ id: '990010000013838', dir: 'HelixMSK/Files/Dictionaries/ISH', user: 'MskInvMedHol', pass: '1Uw76Ef#' ],
-    clinicKomsomolsky: [ id: '990010000013842', dir: 'HelixMSK/Files/Dictionaries/komsomolsky', user: 'MskAlfa', pass: 'iQjw0OWh' ],
-    clinicMedekspert: [ id: '990010000013840', dir: 'HelixMSK/Files/Dictionaries/medekspert', user: 'MskMedexpertP', pass: 'wA3My!0J' ],
-    clinicMedscan: [ id: '990010000013843', dir: 'HelixMSK/Files/Dictionaries/Medscan', user: 'MskMedscan', pass: 'd#8Ug@7E' ],
-    clinicStatusGracy: [ id: '990010000013855', dir: 'HelixSPB/Files/Dictionaries/StatusGracy', user: 'SpbStatGracP', pass: 'Qb#4Ir*1' ],
-    clinicDavinchigrup: [ id: '990010000013845', dir: 'HelixPNZ/Files/Dictionaries/Davinchigrup', user: 'MskDaVinchi', pass: 'uGh9re)u' ],
-    clinicSadko: [ id: '990010000013846', dir: 'HelixPNZ/Files/Dictionaries/Sadko', user: 'MskSadko', pass: 'VOTdPC3A' ]
+    labMSK: [ id: '990010000000015', idtask: '990010000000017', dir: 'HelixMSK/Files/Dictionaries', user: 'TestDictMsk', pass: 'kO3R20eK' ],
+    labSPB: [ id: '990010000000013', idtask: '990010000000013', dir: 'HelixSPB/Files/Dictionaries', user: 'TestDictSpb', pass: '8686Giq0' ],
+    labNSB: [ id: '990010000000029', idtask: '990010000000020', dir: 'HelixNSB/Files/Dictionaries', user: 'TestDictNvsb', pass: '511bLPm3' ],
+    labPNZ: [ id: '990010000000046', idtask: '990010000000021', dir: 'HelixPNZ/Files/Dictionaries', user: 'TestDictPnz', pass: 'IgK~66Ff' ],
+    labEKB: [ id: '990010000000044', idtask: '990010000000019', dir: 'HelixEKB/Files/Dictionaries', user: 'TestDictEkb', pass: 'Fp5LMnKW' ],
+    labNSK: [ id: '990010000000045', idtask: '990010000000022', dir: 'HelixNSK/Files/Dictionaries', user: 'TestDictNor', pass: 'jq9xd6sY' ],
+    labHBR: [ id: '990010000000047', idtask: '990010000000018', dir: 'HelixHBR/Files/Dictionaries', user: 'TestDictHab', pass: 'idTf4WkE' ],
+    clinicRAN: [ id: '990010000001898', idtask: '990010000001898', dir: 'HelixSPB/Files/Dictionaries/RAN', user: 'ran', pass: '7vFal2JBsC' ],
+    clinicONA: [ id: '990010000004936', idtask: '990010000004936', dir: 'HelixSPB/Files/Dictionaries/ONA', user: 'ona', pass: 'svn2CD3KkL' ],
+    clinicBaltMed: [ id: '990010000002030', idtask: '990010000002030', dir: 'HelixSPB/Files/Dictionaries/BaltMed', user: 'SpbMServ', pass: '1tMi8jRz' ],
+//    clinicSPom: [ id: '990010000013379', idtask: '990010000013379', dir: 'HelixSPB/Files/Dictionaries/SkorayaPom', user: 'SpbSkorayaPom', pass: '8$c%%Vo46' ],
+    clinicMedlux: [ id: '990010000013413', idtask: '990010000013413', dir: 'HelixMSK/Files/Dictionaries/Medlux_mostfarm', user: 'MskMedlux', pass: 'Zn8hede7' ],
+    clinicAskona: [ id: '990010000004940', idtask: '990010000004940', dir: 'HelixMSK/Files/Dictionaries/Askona', user: 'MskPMK', pass: 'QdFQIF68' ],
+    clinicDR: [ id: '990010000002008', idtask: '990010000002008', dir: 'HelixMSK/Files/Dictionaries/DR', user: 'MskDoctorRyadom', pass: 'iqBn0gIa' ],
+    clinicBZ: [ id: '990010000001881', idtask: '990010000001881', dir: 'HelixMSK/Files/Dictionaries/BZ', user: 'MskClinicLMS', pass: '1npZfzex' ],
+//    clinicTemp: [ id: '990010000013661', idtask: '990010000013661', dir: 'HelixMSK/Files/Dictionaries/Temp', user: 'MskTemp', pass: 'Hoch9is%%' ],
+//    clinicBZ_EKB: [ id: '990010000013445', idtask: '990010000013445', dir: 'HelixEKB/Files/Dictionaries/BZ_Ekb', user: 'EkbBudZdorov', pass: '0Qk^&8Ko%%' ],
+    clinicSova: [ id: '990010000004941', idtask: '990010000004941', dir: 'HelixMSK/Files/Dictionaries/Sova', user: 'MskSova', pass: 'ehCPz9mx' ],
+    clinicProfMed: [ id: '990010000004939', idtask: '990010000004939', dir: 'HelixNSB/Files/Dictionaries/ProfMed', user: 'SpbProfMedUfa', pass: 'djZ6rA1T' ],
+    clinicMedisPlus: [ id: '990010000013458', idtask: '990010000013458', dir: 'HelixNSB/Files/Dictionaries/MedisPlusKlinika', user: 'SpbKlinikaPskov', pass: '@3Sj*7St' ],
+    clinicMotherhood: [ id: '990010000013673', idtask: '990010000013673', dir: 'HelixPNZ/Files/Dictionaries/Materinstvoidetstvo', user: 'MskMaterinstvoIDetst', pass: 'ZCPuzbw8' ]
+/*    clinicMskDomNaTverskoy: [ id: '990010000013837', idtask: '990010000013837', dir: 'HelixMSK/Files/Dictionaries/DomNaTverskoy', user: 'MskDomNaTverskoy', pass: '83gQlPPL' ],
+    clinicMskProfMedLab: [ id: '990010000013850', idtask: '990010000013850', dir: 'HelixMSK/Files/Dictionaries/profmedlab', user: 'MskProfMedLab', pass: 'The)ais3' ],
+    clinicRGSU: [ id: '990010000013852', idtask: '990010000013852', dir: 'HelixMSK/Files/Dictionaries/RGSU', user: 'MskRGSU', pass: 'TPnYb3OT' ],
+    clinicISH: [ id: '990010000013838', idtask: '990010000013838', dir: 'HelixMSK/Files/Dictionaries/ISH', user: 'MskInvMedHol', pass: '1Uw76Ef#' ],
+    clinicKomsomolsky: [ id: '990010000013842', idtask: '990010000013842', dir: 'HelixMSK/Files/Dictionaries/komsomolsky', user: 'MskAlfa', pass: 'iQjw0OWh' ],
+    clinicMedekspert: [ id: '990010000013840', idtask: '990010000013840', dir: 'HelixMSK/Files/Dictionaries/medekspert', user: 'MskMedexpertP', pass: 'wA3My!0J' ],
+    clinicMedscan: [ id: '990010000013843', idtask: '990010000013843', dir: 'HelixMSK/Files/Dictionaries/Medscan', user: 'MskMedscan', pass: 'd#8Ug@7E' ],
+    clinicStatusGracy: [ id: '990010000013855', idtask: '990010000013855', dir: 'HelixSPB/Files/Dictionaries/StatusGracy', user: 'SpbStatGracP', pass: 'Qb#4Ir*1' ],
+    clinicDavinchigrup: [ id: '990010000013845', idtask: '990010000013845', dir: 'HelixPNZ/Files/Dictionaries/Davinchigrup', user: 'MskDaVinchi', pass: 'uGh9re)u' ],
+    clinicSadko: [ id: '990010000013846', idtask: '990010000013846', dir: 'HelixPNZ/Files/Dictionaries/Sadko', user: 'MskSadko', pass: 'VOTdPC3A' ]
 */]
 def INVITRONAMES = [ 
-    labMSK: [ id: '990010000000002', dir: 'InvitroMSK/Files/Dictionaries' ],
-    labCHLB: [ id: '990010000000043', dir: 'InvitroCHLB/Files/Dictionaries' ],
-    labSMR: [ id: '990010000000041', dir: 'InvitroSMR/Files/Dictionaries' ],
-    labSPB: [ id: '990010000000042', dir: 'InvitroSPB/Files/Dictionaries' ]
-//    labNSB: [ id: '990010000000033', dir: 'InvitroNSB/Files/Dictionaries' ]
+    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' ]
+//    labNSB: [ id: '990010000000033', idtask: '990010000000033', dir: 'InvitroNSB/Files/Dictionaries' ]
 ]
 def ALFANAMES = [ 
-/*    DNKOM: [ id: '990010000000018' ], 
-    Dialab: [ id: '990010000000019' ], 
-    LabQuest: [ id: '990010000000049'], 
+/*    DNKOM: [ id: '990010000000018', idtask: '990010000000023' ], 
+    Dialab: [ id: '990010000000019', idtask: '990010000000024' ], 
+    LabQuest: [ id: '990010000000049', idtask: '990010000000034' ], 
 */    Arhimed: [ id: '990010000000055', idtask: '990010000000041', dir: 'Arhimed/Files/Dictionaries' ] 
 ]
-def GEMOTEST = [ id: '990010000000014', dir: 'GemoTest/Files/Dictionaries', user: 'a_info', pass: 'Ainfo150916' ]
-/* def LITEH = [ id: '990010000000024' ]
-def NAKFF = [ id: '990010000000004' ]
+def GEMOTEST = [ id: '990010000000014', idtask: '990010000000014', dir: 'GemoTest/Files/Dictionaries', user: 'a_info', pass: 'Ainfo150916' ]
+/* def LITEH = [ id: '990010000000024', idtask: '990010000000026' ]
+def NAKFF = [ id: '990010000000004', idtask: '990010000000004' ]
 */ def CMD = [ id: '990010000000003', idtask: '990010000000003', dir: 'CMD/Files/Dictionaries', user: 'SDSIntegration', pass: 'RK5CLTr77' ]
-//def KDL = [ id: '990010000000006' ]
+//def KDL = [ id: '990010000000006', idtask: '990010000000001' ]
 
 def TAG = ''
 pipeline {
@@ -102,7 +102,7 @@ pipeline {
                         sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1
                               docker create -name sync -i \
                                 -v analis-wineservice_analis_Files_netapp:/root/wine32/drive_c/services/analis \
-                                --network=labnetwork ${SYNC_IMAGE} -a prod_lab -e "$value.id" \
+                                --network=labnetwork ${SYNC_IMAGE} -a prod_lab -e "$value.idtask" \
                                 -logfile "C:\Services\Analis\$log_dir\syncmanager_#.log"
                               docker cp infodent.ini sync:/opt/syncmanager/infodent.ini
                               docker start -i sync
@@ -145,7 +145,7 @@ pipeline {
                             -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; \
-                            /usr/bin/xvfb-run -a wine /opt/syncmanager/SyncManager.exe -a prod_lab -e "$value.id" \
+                            /usr/bin/xvfb-run -a wine /opt/syncmanager/SyncManager.exe -a prod_lab -e "$value.idtask" \
                             -logfile "C:\Services\Analis\$log_dir\syncmanager_#.log" '
                           docker cp infodent.ini sync:/opt/syncmanager/infodent.ini
                           docker start -i sync
@@ -155,7 +155,8 @@ pipeline {
                 }
             }
         }
-*/        stage ("ALFA dictionaries") {
+*//*Работает. Не трогать!
+        stage ("ALFA dictionaries") {
             steps {
                 script {
                     ALFANAMES.each { key, value ->
@@ -198,7 +199,7 @@ pipeline {
                 }
             }
         }
-/*        stage ("Gemotest dictionaries") {
+*/        stage ("Gemotest dictionaries") {
             steps {
                 script {
                     echo "Get dictionaries for Gemotest"
@@ -213,9 +214,9 @@ pipeline {
                     log_dir = log_dir.replace("/", "\\")
                     sh """export DOCKER_HOST=tcp://$CLUSTER.open:2376 DOCKER_TLS_VERIFY=1
                           docker create -i --name sync \
-                            -v analis-wineservice_analis_Files_netapp:/root/wine32/drive_c/services/analis \
-                            --network=labnetwork ${SYNC_IMAGE} -a prod_lab -e "$GEMOTEST.id" \
-                            -logfile "C:\Services\Analis\$log_dir\syncmanager_#.log"
+                            -v analis-wineservice_analis_Files_netapp:/root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/ \
+                            --network=labnetwork ${SYNC_IMAGE} -a prod_lab -e "$GEMOTEST.idtask" \
+                            -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
@@ -223,7 +224,7 @@ pipeline {
                 }
             }
         }
-*/
+
 /*  Работает, не трогать!
         stage ("CMD dictionaries") {
             steps {
@@ -232,8 +233,8 @@ pipeline {
                     sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1
                           docker run --rm -i -v analis-wineservice_analis_Files_netapp:/services/ ${WGET_IMAGE} \
                             /bin/ash -c ' \
-                            rm -fv /services/$CMD.dir/*.xml
-                            wget -P /services/$CMD.dir --user=$CMD.user --password=$CMD.pass $FTP.cmd'; \
+                            rm -fv /services/$CMD.dir/*.xml;
+                            wget -P /services/$CMD.dir --user=$CMD.user --password=$CMD.pass $FTP.cmd'
                        """
                     echo "Syncing dictionaries for CMD"
                     def log_dir = CMD.dir.replace("Files", "LOGS")
@@ -241,7 +242,7 @@ pipeline {
                     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/dosdevices/unc/samba.infoclinica.lan/smartdelta01/ \
-                            --network=labnetwork ${SYNC_IMAGE} -a prod_lab -e "$CMD.id" \
+                            --network=labnetwork ${SYNC_IMAGE} -a prod_lab -e "$CMD.idtask" \
                             -logfile "\\\\\\samba.infoclinica.lan\\smartdelta01\\$log_dir\\syncmanager_#.log"
                           docker cp infodent.ini sync:/opt/syncmanager/infodent.ini
                           docker start -i sync