Владимир Томишинец vor 5 Jahren
Ursprung
Commit
750ba480f6
1 geänderte Dateien mit 10 neuen und 13 gelöschten Zeilen
  1. 10 13
      jenkinsfile.get.and.sync.dict

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

@@ -127,14 +127,14 @@ pipeline {
                 script {
                     INVITRONAMES.each { key, value ->
                     echo "CleanUP files for $key"
-                    sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1 
+                    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/$value.dir/*.xml'
                     """
                     echo "Get dictionaries for $key"
                     def log_dir = value.dir.replace("Files", "LOGS")
-                    sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1
+                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
                           docker create -i --name get \
                             -v analis-wineservice_analis_Files_netapp:/root/.wine/dosdevices/unc/samba.infoclinica.lan/smartdelta01 \
                             --network=labnetwork -e DEBUG=false \
@@ -147,8 +147,7 @@ pipeline {
                        """
                     echo "Syncing $key"
                     log_dir = log_dir.replace("/", "\\")
-                    def CLUSTER_GOST = CLUSTER.gost
-                    sh """export DOCKER_HOST=tcp://$CLUSTER_GOST:2376 DOCKER_TLS_VERIFY=1
+                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
                           docker create -i --name sync \
                             -v analis-wineservice_analis_Files_netapp:/root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/ \
                             --network=labnetwork --entrypoint='' \${SYNC_IMAGE} /bin/bash \
@@ -170,14 +169,14 @@ pipeline {
                 script {
                     ALFANAMES.each { key, value ->
                     echo "CleanUP files for $key"
-                    sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1 
+                    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/$value.dir/*.xml'
                        """
                     echo "Get dictionaries for $key"
                     def log_dir = value.dir.replace("Files", "LOGS")
-                    sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1
+                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
                           docker create -i --name get \
                             -v analis-wineservice_analis_Files_netapp:/root/.wine/dosdevices/unc/samba.infoclinica.lan/smartdelta01 \
                             --network=labnetwork -e DEBUG=false \
@@ -190,9 +189,7 @@ pipeline {
                        """
                     echo "Syncing $key"
                     log_dir = log_dir.replace("/", "\\")
-                    def CLUSTER_GOST = CLUSTER.gost
-                    def VERSION
-                    sh """export DOCKER_HOST=tcp://$CLUSTER_GOST:2376 DOCKER_TLS_VERIFY=1
+                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
                           docker create -i --name sync \
                             -v analis-wineservice_analis_Files_netapp:/root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/ \
                             --network=labnetwork --entrypoint='' \${SYNC_IMAGE} /bin/bash \
@@ -212,7 +209,7 @@ pipeline {
             steps {
                 script {
                     echo "Get dictionaries for Gemotest"
-                    sh """export DOCKER_HOST=tcp://$CLUSTER.open: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/$GEMOTEST.dir/*.xml; \
@@ -221,7 +218,7 @@ pipeline {
                     echo "Syncing dictionaries for Gemotest"
                     def log_dir = GEMOTEST.dir.replace("Files", "LOGS")
                     log_dir = log_dir.replace("/", "\\")
-                    sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1
+                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
                           docker create -i --name sync \
                             -v analis-wineservice_analis_Files_netapp:/root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/ \
                             --network=labnetwork ${SYNC_IMAGE} -a prod_lab -e "$GEMOTEST.idtask" \
@@ -237,7 +234,7 @@ pipeline {
             steps {
                 script {
                     echo "Get dictionaries for CMD"
-                    sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1
+                    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;
@@ -246,7 +243,7 @@ pipeline {
                     echo "Syncing dictionaries for CMD"
                     def log_dir = CMD.dir.replace("Files", "LOGS")
                     log_dir = log_dir.replace("/", "\\")
-                    sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1
+                    sh """export DOCKER_HOST=tcp://$GOST_CLUSTER:2376 DOCKER_TLS_VERIFY=1
                           docker create -i --name sync \
                             -v analis-wineservice_analis_Files_netapp:/root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/ \
                             --network=labnetwork ${SYNC_IMAGE} -a prod_lab -e "$CMD.idtask" \