Владимир Томишинец 5 年之前
父节点
当前提交
9afb51a572
共有 1 个文件被更改,包括 14 次插入13 次删除
  1. 14 13
      jenkinsfile.get.and.sync.dict

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

@@ -84,14 +84,8 @@ pipeline {
                         '''
                     }
                     TAG = sh (script:  "cat ${WORKSPACE}/stack-deploy/tags/lab/analis-wineservice.build-version" , returnStdout: true)
-                    sh '''export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
-                          docker stop get || true && docker rm get || true 
-                          docker stop sync || true && docker rm sync || true 
-                       '''
-                    sh '''export DOCKER_HOST=tcp://$OPEN_CLUSTER:2376 DOCKER_TLS_VERIFY=1
-                          docker stop get || true && docker rm get || true 
-                          docker stop sync || true && docker rm sync || true 
-                       '''
+                    container_operate(GOST_CLUSTER)
+                    container_operate(OPEN_CLUSTER)
                 }
             }
         }
@@ -102,10 +96,12 @@ pipeline {
                         echo "Get dictionaries for $key"
                         get_ftp(value.dir, value.user, value.pass, FTP.HELIX, OPEN_CLUSTER, WGET_IMAGE)
                     }
-                    
-                        
+                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
+                          docker pull ${SYNC_IMAGE}
+                       """
                     HELIXNAMES.each { key, value -> 
                         if (value.idtask) {
+                            container_operate(GOST_CLUSTER, [sync])
                             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                                 timeout(time: 15 as Integer, unit: 'MINUTES') {
                                     echo "Syncing dictionaries for $key"
@@ -116,9 +112,7 @@ pipeline {
                             }
                         }
                     }
-                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
-                          docker stop sync || true && docker rm sync || true
-                       """
+                    
                     
                 }
             } 
@@ -297,4 +291,11 @@ def cleanUP(String dir, String CLUSTER, String IMAGE) {
                 /bin/ash -c ' \
                 rm -fv /services/$dir/*.xml'
            """
+}
+def container_operate(String CLUSTER, name = [ get, sync ]) {
+    for (i in name) {
+        sh """export DOCKER_HOST=tcp://$CLUSTER:2376 DOCKER_TLS_VERIFY=1
+          docker stop $i || true && docker rm $i || true
+       """
+    }
 }