Merge pull request #46 from rstudio/chore-deploy

shift deploy to separate job
This commit is contained in:
Steve Nolen 2019-11-05 11:54:31 -05:00 committed by GitHub
commit f1c4167ba1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 9 deletions

12
Jenkinsfile vendored
View file

@ -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')])
}
}
}

27
deploy.Jenkinsfile Normal file
View file

@ -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}"
}
}
}
}