Владимир Томишинец há 5 anos atrás
pai
commit
916fa1d92f
1 ficheiros alterados com 12 adições e 9 exclusões
  1. 12 9
      jenkinsfile.get.and.sync.dict

+ 12 - 9
jenkinsfile.get.and.sync.dict

@@ -1,8 +1,8 @@
 def CLUSTER = [ gost: 'iru-swarm1.infoclinica.lan', open: 'iru-swarm1-open.infoclinica.ru' ]
 def FTP = [ 
-    helix: 'ftp://ex2.helix.ru/Dictionaries/*',
-    cmd: 'ftp://cmd.infoclinica.lan/nsi/*',
-    gemotest: 'ftp://ftp.gemotest.ru/services/*'
+    HELIX: 'ftp://ex2.helix.ru/Dictionaries/*',
+    CMD: 'ftp://cmd.infoclinica.lan/nsi/*',
+    GEMOTEST: 'ftp://ftp.gemotest.ru/services/*'
     ]
 def HELIXNAMES = [
     HelixMSK: [ id: '990010000000015', idtask: '990010000000017', dir: 'HelixMSK/Files/Dictionaries', user: 'TestDictMsk', pass: 'kO3R20eK' ],
@@ -95,19 +95,21 @@ pipeline {
                 }
             }
         }
-/*        stage ("HELIX dictionaries") {
+        stage ("HELIX dictionaries") {
             steps {
                 script {
                     HELIXNAMES.each { key, value -> 
                         echo "Get dictionaries for $key"
-                        sh """export DOCKER_HOST=tcp://$OPEN_CLUSTER:2376 DOCKER_TLS_VERIFY=1 
+/*                        sh """export DOCKER_HOST=tcp://$OPEN_CLUSTER:2376 DOCKER_TLS_VERIFY=1 
                               docker run --rm -i -v analis-wineservice_analis_Files_netapp:/services/ ${WGET_IMAGE} \
                                 /bin/ash -c ' \
                                 rm -fv /services/$value.dir/*.xml; \
-                                wget -P /services/$value.dir --user="$value.user" --password="$value.pass" $FTP.helix'
+                                wget -P /services/$value.dir --user="$value.user" --password="$value.pass" $FTP.HELIX'
                            """
+*/                        get_ftp(key.dir, key.user, key.pass, FTP.HELIX, GOST_CLUSTER, WGET_IMAGE)
                     }
-                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
+                        
+/*                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                         timeout(time: 10 as Integer, unit: 'MINUTES') {
                             HELIXNAMES.each { key, value -> 
                                 if (value.idtask) {
@@ -247,6 +249,7 @@ pipeline {
                             rm -fv /services/$GEMOTEST.dir/*.xml; \
                             wget -P /services/$GEMOTEST.dir --user="$GEMOTEST.user" --password="$GEMOTEST.pass" $FTP.gemotest'
                        """
+                    get_ftp(GEMOTEST.dir, GEMOTEST.user, GEMOTEST.pass, FTP.GEMOTEST, OPEN_CLUSTER, WGET_IMAGE)
                     catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                         timeout(time: 10 as Integer, unit: 'MINUTES') {
                             echo "Syncing dictionaries for Gemotest"
@@ -279,7 +282,7 @@ pipeline {
                             rm -fv /services/$CMD.dir/*.xml;
                             wget -P /services/$CMD.dir --user=$CMD.user --password=$CMD.pass $FTP.cmd'
                        """
-*/                  get(CMD.dir, CMD.user, CMD.pass, FTP.cmd, GOST_CLUSTER, WGET_IMAGE)                    
+*/                  get_ftp(CMD.dir, CMD.user, CMD.pass, FTP.CMD, GOST_CLUSTER, WGET_IMAGE)                    
                     catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                         timeout(time: 10 as Integer, unit: 'MINUTES') {
                             echo "Syncing dictionaries for CMD"
@@ -325,7 +328,7 @@ pipeline {
         }
     }
 }
-def get(String dir, String user, String pass, String ftp, String CLUSTER, String IMAGE) {
+def get_ftp(String dir, String user, String pass, String ftp, String CLUSTER, String IMAGE) {
         sh """export DOCKER_HOST=tcp://$CLUSTER:2376 DOCKER_TLS_VERIFY=1
               docker run --rm -i -v analis-wineservice_analis_Files_netapp:/services/ ${IMAGE} \
                 /bin/ash -c ' \