Владимир Томишинец 5 rokov pred
rodič
commit
775522cb83
1 zmenil súbory, kde vykonal 20 pridanie a 4 odobranie
  1. 20 4
      jenkinsfile.get.and.sync.dict

+ 20 - 4
jenkinsfile.get.and.sync.dict

@@ -56,6 +56,7 @@ def NAKFF = [ id: '990010000000004' ]
 */ def CMD = [ id: '990010000000003', dir: 'CMD/Files/Dictionaries', user: 'SDSIntegration', pass: 'RK5CLTr77' ]
 //def KDL = [ id: '990010000000001' ]
 
+def TAG
 pipeline {
     agent {
         label "swarm"
@@ -68,10 +69,20 @@ pipeline {
         PROD_CLUSTER='iru-swarm1.infoclinica.lan'
         WGET_IMAGE='inutano/wget'
         SYNC_IMAGE='registry.infoclinica.ru:5000/syncmanager:i686.f30-0.1'
-        ANALIS_IMAGE='registry.infoclinica.ru:5000/lab/analis-wineservice:stable'
+        ANALIS_IMAGE='registry.infoclinica.ru:5000/lab/analis-wineservice'
+        STACK_DEPLOY_REPO='ssh://git@git.sdsys.ru:8022/labportal/stack-deploy.git'
         mailto='admin@sdsys.ru'
     }
     stages {
+        stage ("Git pull stack-deploy REPO") {
+            steps {
+                withCredentials([sshUserPrivateKey(credentialsId: 'provision', keyFileVariable: 'GIT_SSH_KEY', passphraseVariable: '', usernameVariable: 'GIT_SSH_USERNAME')]) {
+                    sh '''GIT_SSH_COMMAND='ssh -i ${GIT_SSH_KEY} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' \
+                            git clone ${STACK_DEPLOY_REPO}
+                       '''
+                TAG = script: "cat ${WORKSPACE}/stack-deploy/tags/analis-wineservice.stable-version" , returnStdout: true).split('\n')
+            }
+        }
 /*        stage ("HELIX dictionaries") {
             steps {
                 script {
@@ -158,7 +169,7 @@ pipeline {
                             -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 \
-                            ${ANALIS_IMAGE} -SyncRefInterval=1 LabSystems=$value.id /nocycle
+                            ${ANALIS_IMAGE}:${TAG} -SyncRefInterval=1 LabSystems=$value.id /nocycle
                           docker cp infodent.ini get:/opt/analis/infodent.ini
                           docker cp analis.conf get:/opt/analis/analis.conf
                           docker start -i get
@@ -168,6 +179,7 @@ pipeline {
                     def log_dir = value.dir.replace("Files", "LOGS")
                     log_dir = log_dir.replace("/", "\\")
                     def CLUSTER_GOST = CLUSTER.gost
+                    def VERSION
                     sh """export DOCKER_HOST=tcp://$CLUSTER_GOST:2376 DOCKER_TLS_VERIFY=1
                           docker create -i --name sync \
                             -v analis-wineservice_analis_Files_netapp:/root/wine32/dosdevices/unc/samba.infoclinica.lan/smartdelta01/ \
@@ -238,8 +250,12 @@ pipeline {
         }
 */    }
   
-/*    post {
-        failure {
+    post {
+        always {
+            echo "CleaningUp work directory"
+            deleteDir()
+        }
+/*        failure {
             mail charset: 'UTF-8',
                 subject: "Jenkins Dictionaries sync ERROR",
                 mimeType: 'text/html',