From d6ac34d2fedab1ce3b1c35118ff00003999ae2b7 Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sat, 6 Jun 2020 21:22:23 -0400
Subject: [PATCH] Update sslproxy jenkinsfile to use xai command line

---
 .idea/webServers.xml                      |  6 ++--
 dockerfiles/services/sslproxy/Jenkinsfile | 35 +++++++----------------
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/.idea/webServers.xml b/.idea/webServers.xml
index 41b2672..bc6a2d0 100644
--- a/.idea/webServers.xml
+++ b/.idea/webServers.xml
@@ -3,21 +3,21 @@
   <component name="WebServers">
     <option name="servers">
       <webServer id="daf12c1b-6008-42e3-896d-a26fa1e45573" name="home.xai-corp.net" url="http://192.168.2.11">
-        <fileTransfer host="192.168.2.11" port="22" privateKey="$USER_HOME$/.ssh/id_rsa" accessType="SFTP" username="ansible" keyPair="true">
+        <fileTransfer accessType="SFTP" sshConfigId="88179942-7033-4d53-a907-4d234e4f0c24" sshConfig="home.xai-corp.net" username="ansible">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" />
           </advancedOptions>
         </fileTransfer>
       </webServer>
       <webServer id="e1bf22a3-9b3a-46cf-b9eb-09005d4c9e40" name="home02.xai-corp.net" url="http://192.168.2.22">
-        <fileTransfer host="192.168.2.22" port="22" privateKey="$USER_HOME$/.ssh/id_rsa" accessType="SFTP" username="ansible" keyPair="true">
+        <fileTransfer accessType="SFTP" sshConfigId="a5b66670-445f-4d09-adf1-be21f0206074" sshConfig="home02.xai-corp.net" username="ansible">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" />
           </advancedOptions>
         </fileTransfer>
       </webServer>
       <webServer id="5ea0148a-6c7a-4234-aeb2-def267ab69c8" name="web01.xai-corp.net" url="http://192.168.2.18">
-        <fileTransfer host="192.168.2.18" port="22" privateKey="$USER_HOME$/.ssh/id_rsa" accessType="SFTP" username="ansible" keyPair="true">
+        <fileTransfer accessType="SFTP" sshConfigId="a4ebeb2f-1c23-4fa8-a856-2d3c9902b799" sshConfig="web01.xai-corp.net" username="ansible">
           <advancedOptions>
             <advancedOptions dataProtectionLevel="Private" />
           </advancedOptions>
diff --git a/dockerfiles/services/sslproxy/Jenkinsfile b/dockerfiles/services/sslproxy/Jenkinsfile
index f4a2202..f65783a 100644
--- a/dockerfiles/services/sslproxy/Jenkinsfile
+++ b/dockerfiles/services/sslproxy/Jenkinsfile
@@ -28,12 +28,15 @@ pipeline {
         stage('build') {
             steps {
                 dir(WORKDIR) {
-                    script {
-                        docker.withRegistry('http://dkregistry.xai-corp.net:5000', 'b11d7f1a-81ac-4daf-8842-56afc0d2370e') {
-                            def customImage = docker.build("dkregistry.xai-corp.net:5000/sslproxy:2.1", "-f ${DOCKERFILE} .")
-                            customImage.push()
-                        }
-                    }
+                withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {
+//                     script {
+//                         docker.withRegistry('http://dkregistry.xai-corp.net:5000', 'b11d7f1a-81ac-4daf-8842-56afc0d2370e') {
+//                             def customImage = docker.build("dkregistry.xai-corp.net:5000/sslproxy:2.1", "-f ${DOCKERFILE} .")
+//                             customImage.push()
+//                         }
+//                     }
+                    sh "xai build"
+                }
                 }
             }
         }
@@ -42,31 +45,15 @@ pipeline {
             steps {
                 dir(WORKDIR) {
                     withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {
-                        sh """
-                            export DOCKER_HOST=${DOCKER_HOST}
-                            docker stack deploy --with-registry-auth --prune -c docker-compose-prod.yml sslproxy
-                            (cd ../ && chmod +x ./scaleout.sh && ./scaleout.sh sslproxy_app 30)
-                        """
+                        sh "xai deploy"
                     }
                 }
             }
-        }
-
-        stage('smoke tests') {
-            steps {
-                dir(WORKDIR) {
-                    sleep 10
-                    sh "curl -If https://git.xai-corp.net/"
-                }
-            }
             post {
                 failure {
                     dir(WORKDIR) {
                         withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {
-                            sh """
-                                export DOCKER_HOST=${DOCKER_HOST}
-                                docker service rollback sslproxy_app
-                            """
+                            sh "xai rollback"
                         }
                     }
                 }