Select deis2 for us-east

mozmeao · Mar 14, 2017 · 97e29ec · 97e29ec
1 parent 7b64fa9
commit 97e29ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,4 @@
-@Library('github.com/mozmar/jenkins-pipeline@20170303.1')
+@Library('github.com/glogiotatidis/jenkins-pipeline@deis-updates')
 def stage_deployed = false
 def config
 def docker_image
@@ -95,8 +95,9 @@ conduit {
       node {
         stage ("Deploying to ${deploy.name}") {
           lock("push to ${deploy.name}") {
-            deisLogin(deploy.url, deploy.credentials) {
-              deisPull(deploy.app, docker_image)
+            deis_executable = deploy.deis_executable ?: "deis"
+            deisLogin(deploy.url, deploy.credentials, deis_executable) {
+              deisPull(deploy.app, docker_image, null, deis_executable)
             }
             newRelicDeployment(deploy.newrelic_app, env.GIT_COMMIT_SHORT,
                                "jenkins", "newrelic-api-key")
@@ -113,8 +114,9 @@ conduit {
       node {
         stage ("Deploying to ${deploy.name}") {
           lock("push to ${deploy.name}") {
-            deisLogin(deploy.url, deploy.credentials) {
-              deisPull(deploy.app, docker_image)
+            deis_executable = deploy.deis_executable ?: "deis"
+            deisLogin(deploy.url, deploy.credentials, deis_executable) {
+              deisPull(deploy.app, docker_image, null, deis_executable)
             }
             newRelicDeployment(deploy.newrelic_app, env.GIT_COMMIT_SHORT,
                                "jenkins", "newrelic-api-key")

diff --git a/jenkins.yml b/jenkins.yml
@@ -34,6 +34,7 @@ deploy:
       credentials: jenkins-deis-2
       app: "snippets-prod"
       newrelic_app: "snippets-prod-us-east"
+      deis_executable: "deis2"
 notifications:
   irc:
     server: irc.mozilla.org:6697