From 0016ba2f4b07fcc28e67161a459d2355241b8219 Mon Sep 17 00:00:00 2001
From: Steve Nolen <technolengy@gmail.com>
Date: Thu, 31 Oct 2019 09:56:31 -0400
Subject: [PATCH 1/2] shift deploy to separate job

---
 Jenkinsfile        | 12 +++---------
 deploy.Jenkinsfile | 27 +++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 deploy.Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
index 1a66420..213837e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,19 +23,13 @@ pipeline {
       }
     }
     stage('deploy') {
-      agent {
-        dockerfile {
-          dir 'jenkins'
-          label 'docker-4x'
-          additionalBuildArgs '--build-arg DOCKER_GID=$(stat -c %g /var/run/docker.sock) --build-arg JENKINS_UID=$(id -u jenkins) --build-arg JENKINS_GID=$(id -g jenkins)'
-          args '-v /var/run/docker.sock:/var/run/docker.sock --group-add docker'
-        }
-      }
+      agent none
       when {
         branch 'master'
       }
       steps {
-        sh 'make serverless-deploy.production'
+        build(job: 'hostedapps/deploy/r-builds', wait: true,
+              parameters: [string(name: 'ENVIRONMENT', value: 'staging')])
       }
     }
   }
diff --git a/deploy.Jenkinsfile b/deploy.Jenkinsfile
new file mode 100644
index 0000000..a46efa2
--- /dev/null
+++ b/deploy.Jenkinsfile
@@ -0,0 +1,27 @@
+pipeline {
+  agent {
+    dockerfile {
+      dir 'jenkins'
+      label 'docker'
+      additionalBuildArgs '--build-arg DOCKER_GID=$(stat -c %g /var/run/docker.sock) --build-arg JENKINS_UID=$(id -u jenkins) --build-arg JENKINS_GID=$(id -g jenkins)'
+      args '-v /var/run/docker.sock:/var/run/docker.sock --group-add docker'
+    }
+  }
+  environment {
+    HOME = "."
+  }
+  options {
+    ansiColor('xterm')
+  }
+  parameters {
+    choice(name: 'ENVIRONMENT', choices: ['staging', 'production'],
+           description: 'The target environment to deploy to.')
+  }
+  stages {
+    stage('deploy') {
+      steps {
+        sh 'make serverless-deploy.${params.ENVIRONMENT}'
+      }
+    }
+  }
+}

From d1c0f3c94ade8a15b8368745d7ebac41e8cb926d Mon Sep 17 00:00:00 2001
From: Steve Nolen <technolengy@gmail.com>
Date: Thu, 31 Oct 2019 11:08:14 -0400
Subject: [PATCH 2/2] pr feedback

---
 deploy.Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy.Jenkinsfile b/deploy.Jenkinsfile
index a46efa2..f4f873e 100644
--- a/deploy.Jenkinsfile
+++ b/deploy.Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
   stages {
     stage('deploy') {
       steps {
-        sh 'make serverless-deploy.${params.ENVIRONMENT}'
+        sh "make serverless-deploy.${params.ENVIRONMENT}"
       }
     }
   }