diff --git a/Jenkinsfile b/Jenkinsfile index 7a2c742..fc67ba1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,19 +1,24 @@ pipeline { agent any stages { - stage('setup') { - steps { - sh 'git checkout delta' - sh 'git reset --hard origin/delta' - sh 'git clean -fd' - } - } - stage('test') { + stage('startup and shutdown check') { steps { sh './testrun.sh' logParser failBuildOnError: true, projectRulePath: 'Jenkinsparse', parsingRulesPath: 'Jenkinsparse', showGraphs: true, unstableOnWarning: true, useProjectRule: true sh 'git reset --hard' } } + stage('queue') { + when { + branch '**/delta' + } + steps { + checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[credentialsId: '359ebf7c-e2b9-45ec-992c-ff8d5549deb6', url: 'git@dev.sys.reslate.xyz:ydeng/rsemcs.git']]]) + sh 'git merge --strategy-option theirs origin/delta' + sshagent(['359ebf7c-e2b9-45ec-992c-ff8d5549deb6']) { + sh 'git push origin master' + } + } + } } }