Владимир Томишинец %!s(int64=5) %!d(string=hai) anos
pai
achega
275fef0625
Modificáronse 1 ficheiros con 3 adicións e 21 borrados
  1. 3 21
      jenkinsfile.get.and.sync.dict

+ 3 - 21
jenkinsfile.get.and.sync.dict

@@ -100,13 +100,7 @@ pipeline {
                 script {
                     HELIXNAMES.each { key, value -> 
                         echo "Get dictionaries for $key"
-/*                        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'
-                           """
-*/                        get_ftp(value.dir, value.user, value.pass, FTP.HELIX, OPEN_CLUSTER, WGET_IMAGE)
+                        get_ftp(value.dir, value.user, value.pass, FTP.HELIX, OPEN_CLUSTER, WGET_IMAGE)
                     }
                         
 /*                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
@@ -243,12 +237,6 @@ pipeline {
             steps {
                 script {
                     echo "Get dictionaries for Gemotest"
-                    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/$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') {
@@ -276,13 +264,7 @@ pipeline {
             steps {
                 script {
                     echo "Get dictionaries for CMD"
-/*                    sh """export DOCKER_HOST=tcp://$GOST_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/$CMD.dir/*.xml;
-                            wget -P /services/$CMD.dir --user=$CMD.user --password=$CMD.pass $FTP.cmd'
-                       """
-*/                  get_ftp(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"
@@ -333,6 +315,6 @@ def get_ftp(String dir, String user, String pass, String ftp, String CLUSTER, St
               docker run --rm -i -v analis-wineservice_analis_Files_netapp:/services/ ${IMAGE} \
                 /bin/ash -c ' \
                 rm -fv /services/$dir/*.xml;
-                wget -P /services/$dir --user=$user --password=$pass $ftp'
+                wget -P /services/$dir --user=$user --password='$pass' $ftp'
            """
 }