From c69a30ac0af9750365074d7dbfab7d67a407dd90 Mon Sep 17 00:00:00 2001
From: Alastair Smith <allysmith424@gmail.com>
Date: Mon, 4 Mar 2019 12:01:30 -0600
Subject: [PATCH] update Jenkinsfile

---
 Jenkinsfile | 75 ++++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 10959dcd49..dba75c5997 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,45 +16,44 @@ pipeline {
       when {
         expression { env.GIT_URL == 'https://github.com/docker/docs-private.git' }
       }
-      steps {
-        sh 'echo "Success!"'
+      stages {
+        stage( 'build and push image' ) {
+          when {
+            branch 'jenkins-test'
+          }
+          steps {
+            sh 'echo "Would build and push new staging image here"'
+            // withDockerRegistry(reg) {
+            //   sh """
+            //     docker image build --tag docs/docs-private:build-${env.BUILD_NUMBER} . && \
+            //     docker image push docs/docs-private:build-${env.BUILD_NUMBER}
+            //   """
+            // }
+          }
+        }
+        stage( 'update service' ) {
+          when {
+            branch 'jenkins-test'
+          }
+          steps {
+            sh 'echo "Would update staging service here"'
+            // withVpn(dtrVpnAddress) {
+            //   withCredentials(ucpBundle) {
+            //     sh 'unzip -o $UCP' 
+            //   }
+            //   withDockerRegistry(reg) {
+            //     sh """
+            //       export DOCKER_TLS_VERIFY=1
+            //       export COMPOSE_TLS_VERSION=TLSv1_2
+            //       export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
+            //       export DOCKER_HOST=tcp://ucp.corp-us-east-1.aws.dckr.io:443
+            //       docker service update --detach=false --force --image docs/docs-private:build-${env.BUILD_NUMBER} docs-beta-docker-com_docs --with-registry-auth
+            //     """
+            //   }
+            // }
+          }
+        }
       }
-      // stages {
-      //   stage( 'build and push image' ) {
-      //     when {
-      //       branch 'master'
-      //     }
-      //     steps {
-      //       withDockerRegistry(reg) {
-      //         sh """
-      //           docker image build --tag docs/docs-private:build-${env.BUILD_NUMBER} . && \
-      //           docker image push docs/docs-private:build-${env.BUILD_NUMBER}
-      //         """
-      //       }
-      //     }
-      //   }
-      //   stage( 'update service' ) {
-      //     when {
-      //       branch 'master'
-      //     }
-      //     steps {
-      //       withVpn(dtrVpnAddress) {
-      //         withCredentials(ucpBundle) {
-      //           sh 'unzip -o $UCP' 
-      //         }
-      //         withDockerRegistry(reg) {
-      //           sh """
-      //             export DOCKER_TLS_VERIFY=1
-      //             export COMPOSE_TLS_VERSION=TLSv1_2
-      //             export DOCKER_CERT_PATH=${WORKSPACE}/ucp-bundle-success_bot
-      //             export DOCKER_HOST=tcp://ucp.corp-us-east-1.aws.dckr.io:443
-      //             docker service update --detach=false --force --image docs/docs-private:build-${env.BUILD_NUMBER} docs-beta-docker-com_docs --with-registry-auth
-      //           """
-      //         }
-      //       }
-      //     }
-      //   }
-      // }
     }
   }
 }