From 573b4bc2e1fb0bead25982da17d2333c98b2bd34 Mon Sep 17 00:00:00 2001
From: Ron Compos <rcompos@gmail.com>
Date: Fri, 25 Sep 2020 10:55:07 -0600
Subject: [PATCH 1/2] Testin jenkins pipelin

---
 .Jenkinsfile.deploy-argo.swp | Bin 0 -> 12288 bytes
 Jenkinsfile                  |  23 +++++++++-
 Jenkinsfile.deploy-argo      |  86 +++++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 .Jenkinsfile.deploy-argo.swp
 create mode 100644 Jenkinsfile.deploy-argo

diff --git a/.Jenkinsfile.deploy-argo.swp b/.Jenkinsfile.deploy-argo.swp
new file mode 100644
index 0000000000000000000000000000000000000000..07049645a7daeec751c1350d1973864f2c442474
GIT binary patch
literal 12288
zcmeI2O=u)V6vrznt{+*IEb2-3?QCQwn(mpnvc^ab$tKyvO~P(s0t>=yPj}5so1X5r
zt2+`xR6Kb0DCo_DUc4;qK@bHmdQcG*yoic|AP6}uqTc*he@xFzGHw#~5~zk>dZs>J
zzxS_K{TNcU%KE|*jq76!*F%hbNN)9;-S62azc6NcE#DJ??D^lz^a8i(Iku-eo@qFJ
z$G(;tEC(ER%QeUITH2-&Ibrz)?rzwwsM`+LE$%zsmSzMEudgZ9p%hRG97cgCtZU;Z
z*}133DstM{!WlX>w00N^YOGQ~DWDWk3Md7X0!jg;fKosyaLg45{Q>qmVz?uXV?DhO
z^xV_0>ZTM>3Md7X0!jg;fKosypcGIFC<T-PN&%(7F;u{?7`u5FV~xAvJpTWm{r>;=
zLB_5F543;-3~&Vu0|KYPDKG?1fZYce`x$%*Zh%Gb&q>Dq1iykG!583T@IIIaPl3~5
z5d1L6*yrFG@YDT_eFZ)R*TH+>dGI(G0)OAf*ze$L@EN!PJ^~+rx51mh0fS)oUdDa{
z--36+TVM`64DJMf-NV=);5)Dk#=sNcG4LoD05?y-C-4R^!BubtTml!t9GC=8f=9qR
z&~pa}&;mA)8qa{2fVz|dN&%(7@l#-j5lOPY$-TR!Tpo!>5S7bBrswRPv}cGHOi<yh
zId*QmGFIrA-Qq$R4UW$AkQgNg#Hcj9&D~A?;=+s7>6NMF3-i_GsioPS3Ci17X6JTB
zNTW4ZM5YNt^~g!Pr`Hx1XR2!}i#wJre8<?rsWi(DxEU5k+fNscVQ#E)*P>F~7IoU$
zMib7lg|v-wxQ`?hUzreXDUvuV75?0KJI<stk95g!Bg07pZE-iGfWH#KJ4>fE!6|HV
zx|YbGi{>>FW?=iFAkU?Bd7h5emxSJqLt1Y~k_18|LhcK=E}ax11TGa5gT;}wHCa*_
znOwx=8tM2PFKiMGH^z;6t<cq(M|1RbyByUVTQsR|ySQ=d%t00}_qH80mM?GZjHf#~
z8DpW)9R`u*nHxMHKY}Ao?l@k2aIy3FVux{Q;?@%;x>K}gKAzL-MPgEa)ef60ykUzl
z*eVr^qhul_kRG<-hy_b7TpnhU6J1SxR_}b}{IhlBVm_DXHm;uSHgsKPV{X55VWeXF
zrlX%M{yzDbOv(0K@=Yq1wa0gEHa#j#N48^ibfns5BTdf@4cp~Gsc5)c?MKP(`~`KW
zt$XxjpG%XRYSQQZcW?S0O8m<<XyRY@w<M9XFcam|yu@bjlgB-2*=H2n*J|uEX?2>3
zw~IW<OFC&<+%6CE((3Ab_0sIs$-;2@snFHEe0gc*!entcz86Ug`#iqK$sTWd)>j68
z;JuT_)!sXKQ=j*Ews-P@w`cFfd7EsT-1LFAO)Pjjlk=>|KXq>$qO6LdT26{)Dd1rg
zxT~S%Md1X6LBvPX0)raduw^aU)O;gA9h#q=nkkIvVPLmPxj@q4%w|VrKBR3;Gio*Y
zsDRh|K4{NEp(r)ExdGSVbBkr#?NjZtaj8^s4U`2Db5IRYa`8gQ3wzg#mL{o~WR=#8
zYFbBM5wj7x9e8eBwzrvY``p1BMp~9j5T`c`+(PK0X@pc3!Djj8<Y;`^^;>~ilq#p&
T=O{*mXjV5kUUba$Ea}sKK?(y;

literal 0
HcmV?d00001

diff --git a/Jenkinsfile b/Jenkinsfile
index a19b887..e31af53 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -115,13 +115,14 @@ pipeline {
     stage('publish') {
       steps {
         slackSend (
-          message: "Jenkins PR build (${env.GIT_BRANCH_NAME}: ${env.GIT_REF}) - Publishing...",
+          message: "Jenkins PR build (${env.GIT_BRANCH_NAME}: ${env.GIT_REF}) - Publishing docker image...",
           color: "#6067f1"
         )
         script {
           docker.withRegistry('', credentialsId) {
             sh """
             docker push hellobloom/bloom-vault:${env.GIT_REF}
+            docker push hellobloom/bloom-vault
             """
           }
         }
@@ -129,8 +130,26 @@ pipeline {
           message: "Jenkins PR build (${env.GIT_BRANCH_NAME}: ${env.GIT_REF}) - Publish finished! ${env.BUILD_URL}display/redirect",
           color: "#ea8afb"
         )
+        slackSend (
+          message: "Jenkins PR build (${env.GIT_BRANCH_NAME}: ${env.GIT_REF}) - Update helm chart repo",
+          color: "#6067f1"
+        )
+        script {
+          docker.withRegistry('', credentialsId) {
+            sh """
+            docker push hellobloom/bloom-vault:${env.GIT_REF}
+            docker push hellobloom/bloom-vault
+            """
+          }
+        }
+        slackSend (
+          message: "Jenkins PR build (${env.GIT_BRANCH_NAME}: ${env.GIT_REF}) - Helm chart update finished! ${env.BUILD_URL}display/redirect",
+          color: "#ea8afb"
+        )
       }
     }
+    stage('deploy-bloom-co-dev') {
+    }
   }
 
   post {
@@ -141,4 +160,4 @@ pipeline {
       )
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Jenkinsfile.deploy-argo b/Jenkinsfile.deploy-argo
new file mode 100644
index 0000000..b5e90f2
--- /dev/null
+++ b/Jenkinsfile.deploy-argo
@@ -0,0 +1,86 @@
+node {
+  SSH_KEY = sh(returnStdout: true, script: 'cat /srv/jenkins/ssh_key')
+  NPMRC = sh(returnStdout: true, script: 'cat /srv/jenkins/npmrc')
+}
+
+pipeline {
+  environment {
+    credentialsId = 'docker-hub-credentials'
+  }
+
+  agent any
+
+  stages {
+    stage('checkout') {
+        steps {
+          checkout scm
+          script {
+            env.GIT_BRANCH_NAME=sh(returnStdout: true, script: "git rev-parse --abbrev-ref HEAD").trim()
+            env.GIT_REF=sh(returnStdout: true, script: "git rev-parse HEAD").trim()
+          }
+        }
+    }
+    stage('build') {
+      steps {
+        //slackSend (
+        //  message: "Jenkins deploy (${env.GIT_BRANCH_NAME}: ${env.GIT_REF}) - Build...",
+        //  color: "#6067f1"
+        //)
+        //script {
+        //  docker.withRegistry('', credentialsId) {
+        //    sh """
+        //    docker build -f Dockerfile . --build-arg SSH_KEY="$SSH_KEY" --build-arg NPMRC='$NPMRC' -t hellobloom/bloom-vault:${env.GIT_REF}
+        //    docker tag hellobloom/bloom-vault:${env.GIT_REF} hellobloom/bloom-vault
+        //    """
+        //  }
+        //}
+        //slackSend (
+        //  message: "Jenkins deploy (${env.GIT_BRANCH_NAME}: ${env.GIT_REF}) - Finished build",
+        //  color: "#00e981"
+        //)
+        container('any') {
+          sh """
+             echo "Build
+          """
+        }
+      }
+    }
+    stage('publish') {
+      steps {
+//        slackSend (
+//          message: "Jenkins deploy (${env.GIT_BRANCH_NAME}: ${env.GIT_REF}) - Publishing...",
+//          color: "#6067f1"
+//        )
+//        script {
+//          docker.withRegistry('', credentialsId) {
+//            sh """
+//            docker push hellobloom/bloom-vault:${env.GIT_REF}
+//            docker push hellobloom/bloom-vault
+//            """
+//          }
+//        }
+//        slackSend (
+//          message: "Jenkins deploy (${env.GIT_BRANCH_NAME}: ${env.GIT_REF}) - Publish finished! ${env.BUILD_URL}display/redirect",
+//          color: "#ea8afb"
+//        )
+      }
+    }
+    stage('deploy') {
+      steps {
+        //slackSend(
+        //  message: "Manual deployment required. Use the `deploy.sh` scripts on Vault VMs.",
+        //  color: "#00e981"
+        )
+      }
+    }
+  }
+
+  post {
+    unsuccessful {
+      //slackSend (
+      //  message: "Jenkins deploy (${env.GIT_BRANCH_NAME}: ${env.GIT_REF}) - Unsuccessful ${env.BUILD_URL}display/redirect",
+      //  color: "#c13801"
+      //)
+    }
+  }
+}

From 294704d012e835f2439d68f96de00869c3decd3c Mon Sep 17 00:00:00 2001
From: Ron Compos <rcompos@gmail.com>
Date: Thu, 10 Dec 2020 14:08:37 -0700
Subject: [PATCH 2/2] test commit

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index e31af53..07c8a42 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,6 +2,7 @@ node {
   SSH_KEY = sh(returnStdout: true, script: 'cat /srv/jenkins/ssh_key')
   NPMRC = sh(returnStdout: true, script: 'cat /srv/jenkins/npmrc')
 }
+// comment
 
 pipeline {
   environment {