From 97e29eca5cac521fe6778378941aaa79fb5919c0 Mon Sep 17 00:00:00 2001 From: Giorgos Logiotatidis Date: Tue, 14 Mar 2017 00:28:47 +0200 Subject: [PATCH] Select deis2 for us-east --- Jenkinsfile | 12 +++++++----- jenkins.yml | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d9063edd9..e6b6cf353 100644 --- 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 index 11b1a9335..2964e0450 100644 --- 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