2020-04-03 11:09:05 +02:00
|
|
|
pipeline {
|
|
|
|
agent any
|
|
|
|
stages {
|
|
|
|
stage('Stage 1') {
|
|
|
|
steps {
|
2020-04-03 11:31:01 +02:00
|
|
|
sh "git checkout -f ${env.master}"
|
|
|
|
|
2020-04-03 11:09:05 +02:00
|
|
|
}
|
|
|
|
}
|
2020-04-03 11:31:01 +02:00
|
|
|
stage('Merge with master') {
|
|
|
|
when {
|
|
|
|
not {
|
|
|
|
branch 'master'
|
|
|
|
}
|
|
|
|
}
|
|
|
|
agent {
|
|
|
|
label "master"
|
|
|
|
}
|
|
|
|
steps {
|
|
|
|
sh 'git checkout -f origin/master'
|
|
|
|
sh "git merge --ff-only ${env.BRANCH_NAME}"
|
|
|
|
}
|
2020-04-03 11:09:05 +02:00
|
|
|
}
|
|
|
|
}
|