2022-01-08 20:23:08 +00:00
|
|
|
pipeline {
|
|
|
|
agent any
|
|
|
|
stages {
|
2022-01-20 09:00:47 +00:00
|
|
|
stage('startup and shutdown check') {
|
2022-01-08 20:23:08 +00:00
|
|
|
steps {
|
|
|
|
sh './testrun.sh'
|
|
|
|
logParser failBuildOnError: true, projectRulePath: 'Jenkinsparse', parsingRulesPath: 'Jenkinsparse', showGraphs: true, unstableOnWarning: true, useProjectRule: true
|
|
|
|
sh 'git reset --hard'
|
|
|
|
}
|
|
|
|
}
|
2022-01-20 09:00:47 +00:00
|
|
|
stage('queue') {
|
2022-01-20 09:03:44 +00:00
|
|
|
when {
|
|
|
|
branch '**/delta'
|
|
|
|
}
|
2022-01-20 09:00:47 +00:00
|
|
|
steps {
|
2022-01-20 09:19:52 +00:00
|
|
|
sh 'git checkout master'
|
2022-01-20 09:00:47 +00:00
|
|
|
sh 'git merge --strategy-option theirs origin/delta'
|
|
|
|
sshagent(['359ebf7c-e2b9-45ec-992c-ff8d5549deb6']) {
|
|
|
|
sh 'git push origin master'
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2022-01-08 20:23:08 +00:00
|
|
|
}
|
|
|
|
}
|