Владимир Томишинец 5 سال پیش
والد
کامیت
854ecf0d3c
2فایلهای تغییر یافته به همراه17 افزوده شده و 18 حذف شده
  1. 1 0
      analis.conf
  2. 16 18
      jenkinsfile.get.and.sync.dict

+ 1 - 0
analis.conf

@@ -5,3 +5,4 @@ AnalisInterval=0
 LabExchangeInterval=0
 CreateXMLInterval=0
 LoadPoolInterval=0
+SyncRefInterval=1

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

@@ -5,13 +5,13 @@ def FTP = [
     gemotest: 'ftp://ftp.gemotest.ru/services/*'
     ]
 def HELIXNAMES = [
-    labMSK: [ id: '990010000000017', dir: 'HelixMSK/Files/Dictionaries', user: 'TestDictMsk', pass: 'kO3R20eK' ],
+    labMSK: [ id: '990010000000015', dir: 'HelixMSK/Files/Dictionaries', user: 'TestDictMsk', pass: 'kO3R20eK' ],
     labSPB: [ id: '990010000000013', dir: 'HelixSPB/Files/Dictionaries', user: 'TestDictSpb', pass: '8686Giq0' ],
-    labNSB: [ id: '990010000000020', dir: 'HelixNSB/Files/Dictionaries', user: 'TestDictNvsb', pass: '511bLPm3' ],
-    labPNZ: [ id: '990010000000021', dir: 'HelixPNZ/Files/Dictionaries', user: 'TestDictPnz', pass: 'IgK~66Ff' ],
-    labEKB: [ id: '990010000000019', dir: 'HelixEKB/Files/Dictionaries', user: 'TestDictEkb', pass: 'Fp5LMnKW' ],
-    labNSK: [ id: '990010000000022', dir: 'HelixNSK/Files/Dictionaries', user: 'TestDictNor', pass: 'jq9xd6sY' ],
-    labHBR: [ id: '990010000000018', dir: 'HelixHBR/Files/Dictionaries', user: 'TestDictHab', pass: 'idTf4WkE' ],
+    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' ],
@@ -39,22 +39,22 @@ def HELIXNAMES = [
 */]
 def INVITRONAMES = [ 
     labMSK: [ id: '990010000000002', dir: 'InvitroMSK/Files/Dictionaries' ],
-    labCHLB: [ id: '990010000000032', dir: 'InvitroCHLB/Files/Dictionaries' ],
-    labSMR: [ id: '990010000000031', dir: 'InvitroSMR/Files/Dictionaries' ],
-    labSPB: [ id: '990010000000030', dir: 'InvitroSPB/Files/Dictionaries' ],
-    labNSB: [ id: '990010000000033', dir: 'InvitroNSB/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' ]
 ]
 def ALFANAMES = [ 
-/*    DNKOM: [ id: '990010000000041' ], 
-    Dialab: [ id: '990010000000024' ], 
-    LabQuest: [ id: '990010000000034'], 
+/*    DNKOM: [ id: '990010000000018' ], 
+    Dialab: [ id: '990010000000019' ], 
+    LabQuest: [ id: '990010000000049'], 
 */    Arhimed: [ id: '990010000000055', dir: 'Arhimed/Files/Dictionaries' ] 
 ]
 def GEMOTEST = [ id: '990010000000014', dir: 'GemoTest/Files/Dictionaries', user: 'a_info', pass: 'Ainfo150916' ]
-/* def LITEH = [ id: '990010000000026' ]
+/* def LITEH = [ id: '990010000000024' ]
 def NAKFF = [ id: '990010000000004' ]
 */ def CMD = [ id: '990010000000003', dir: 'CMD/Files/Dictionaries', user: 'SDSIntegration', pass: 'RK5CLTr77' ]
-//def KDL = [ id: '990010000000001' ]
+//def KDL = [ id: '990010000000006' ]
 
 def TAG = ''
 pipeline {
@@ -65,8 +65,6 @@ pipeline {
         JENKINS_MAIL='jenkins.dev@sdsys.ru'
         SMTP_SERVER='mail.sdsys.ru'
         DOCKER_CERT_PATH='/run/secrets/swarm'
-        OPEN_CLUSTER='iru-swarm1-open.infoclinica.ru'
-        PROD_CLUSTER='iru-swarm1.infoclinica.lan'
         WGET_IMAGE='inutano/wget'
         SYNC_IMAGE='registry.infoclinica.ru:5000/syncmanager:i686.f30-0.1'
         ANALIS_IMAGE='registry.infoclinica.ru:5000/lab/analis-wineservice'
@@ -174,7 +172,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/$value.dir \
-                            ${ANALIS_IMAGE}:${TAG} SyncRefInterval=10 LabSystems=$value.id /nocycle
+                            ${ANALIS_IMAGE}:${TAG} LabSystems=$value.id /nocycle
                           docker cp infodent.ini get:/opt/analis/infodent.ini
                           docker cp analis.conf get:/opt/analis/analis.conf
                           docker start -i get