Владимир Томишинец 5 년 전
부모
커밋
4e1b5732b1
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      jenkinsfile.get.and.sync.dict

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

@@ -126,11 +126,12 @@ pipeline {
                             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
                           docker create -i --name get \
                             -v analis-wineservice_analis_Files_netapp:/root/.wine/dosdevices/unc/samba.infoclinica.lan/smartdelta01 \
                             --network=labnetwork -e DEBUG=false \
-                            -e LOGPATH=/root/.wine/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$value.dir \
+                            -e LOGPATH=/root/.wine/dosdevices/unc/samba.infoclinica.lan/smartdelta01/$log_dir \
                             ${ANALIS_IMAGE} -SyncRefInterval=1 LabSystems=$value.id /nocycle
                           docker cp infodent.ini get:/opt/analis/infodent.ini
                           docker cp analis.conf get:/opt/analis/analis.conf
@@ -138,7 +139,6 @@ pipeline {
                           docker rm get
                        """
                     echo "Syncing $key"
-                    def log_dir = value.dir.replace("Files", "LOGS")
                     log_dir = log_dir.replace("/", "\\")
                     sh """export DOCKER_HOST=tcp://$CLUSTER.gost:2376 DOCKER_TLS_VERIFY=1
                           docker create -i --name sync \
@@ -168,6 +168,7 @@ pipeline {
                             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
                           docker create -i --name get \
                             -v analis-wineservice_analis_Files_netapp:/root/.wine/dosdevices/unc/samba.infoclinica.lan/smartdelta01 \
@@ -180,7 +181,6 @@ pipeline {
                           docker rm get
                        """
                     echo "Syncing $key"
-                    def log_dir = value.dir.replace("Files", "LOGS")
                     log_dir = log_dir.replace("/", "\\")
                     def CLUSTER_GOST = CLUSTER.gost
                     def VERSION