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

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

@@ -19,8 +19,8 @@ def HELIXNAMES = [
     clinicRGSU: [ id: '990010000013852', dir: 'HelixMSK/Files/Dictionaries/RGSU', user: 'MskRGSU', pass: 'TPnYb3OT' ],
     clinicSova: [ id: '990010000004941', dir: 'HelixMSK/Files/Dictionaries/Sova', user: 'MskSova', pass: 'ehCPz9mx' ],
     clinicTemp: [ id: '990010000013661', dir: 'HelixMSK/Files/Dictionaries/Temp', user: 'MskTemp', pass: 'Hoch9is%' ],
-    HelixEKB: [ id: '990010000000044', idtask: '990010000000019', dir: 'HelixEKB/Files/Dictionaries', user: 'TestDictEkb', pass: 'Fp5LMnKW' ],
-/*    clinicBZ_EKB: [ id: '990010000013445', dir: 'HelixEKB/Files/Dictionaries/BZ_Ekb', user: 'EkbBudZdorov', pass: '0Qk^&8Ko%%' ],
+/*    HelixEKB: [ id: '990010000000044', idtask: '990010000000019', dir: 'HelixEKB/Files/Dictionaries', user: 'TestDictEkb', pass: 'Fp5LMnKW' ],
+    clinicBZ_EKB: [ id: '990010000013445', dir: 'HelixEKB/Files/Dictionaries/BZ_Ekb', user: 'EkbBudZdorov', pass: '0Qk^&8Ko%%' ],
     HelixNSK: [ id: '990010000000045', idtask: '990010000000022', dir: 'HelixNSK/Files/Dictionaries', user: 'TestDictNor', pass: 'jq9xd6sY' ],
     HelixPNZ: [ id: '990010000000046', idtask: '990010000000021', dir: 'HelixPNZ/Files/Dictionaries', user: 'TestDictPnz', pass: 'IgK~66Ff' ],
     clinicDavinchigrup: [ id: '990010000013845', dir: 'HelixPNZ/Files/Dictionaries/Davinchigrup', user: 'MskDaVinchi', pass: 'uGh9re)u' ],
@@ -131,6 +131,7 @@ pipeline {
                         timeout(time: 10 as Integer, unit: 'MINUTES') {
                             INVITRONAMES.each { key, value -> 
                                 echo "Syncing $key"
+                                container_operate(GOST_CLUSTER, [ 'sync' ])
                                 def log_dir = value.dir.replace("Files", "LOGS")
                                 log_dir = log_dir.replace("/", "\\")
                                 sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
@@ -149,9 +150,6 @@ pipeline {
                             }
                         }       
                     }
-                sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
-                      docker stop sync || true && docker rm sync || true
-                   """    
                 }
             }
         }
@@ -169,6 +167,7 @@ pipeline {
                         timeout(time: 10 as Integer, unit: 'MINUTES') {
                             ALFANAMES.each { key, value -> 
                                 echo "Syncing $key"
+                                container_operate(GOST_CLUSTER, [ 'sync' ])
                                 def log_dir = value.dir.replace("Files", "LOGS")
                                 log_dir = log_dir.replace("/", "\\")
                                 sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
@@ -186,9 +185,6 @@ pipeline {
                             }
                         }
                     }
-                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
-                          docker stop sync || true && docker rm sync || true
-                       """
                 }
             }
         }
@@ -200,14 +196,12 @@ pipeline {
                     catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                         timeout(time: 10 as Integer, unit: 'MINUTES') {
                             echo "Syncing dictionaries for Gemotest"
+                            container_operate(GOST_CLUSTER, [ 'sync' ])
                             def log_dir = GEMOTEST.dir.replace("Files", "LOGS")
                             log_dir = log_dir.replace("/", "\\")
                             sync(log_dir, GEMOTEST.idtask, SYNC_IMAGE, GOST_CLUSTER)
                         }
                     }
-                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
-                          docker stop sync || true && docker rm sync || true
-                       """      
                 }
             }
         }
@@ -219,14 +213,12 @@ pipeline {
                     catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                         timeout(time: 10 as Integer, unit: 'MINUTES') {
                             echo "Syncing dictionaries for CMD"
+                            container_operate(GOST_CLUSTER, [ 'sync' ])
                             def log_dir = CMD.dir.replace("Files", "LOGS")
                             log_dir = log_dir.replace("/", "\\")
                             sync(log_dir, CMD.idtask, SYNC_IMAGE, GOST_CLUSTER)
                         }
                     }
-                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
-                          docker stop sync || true && docker rm sync || true
-                       """     
                 }
             }
         }