Renamed startup check stage and restored queue stage.
This commit is contained in:
parent
0dedd3c904
commit
ed23d5190e
11
Jenkinsfile
vendored
11
Jenkinsfile
vendored
@ -8,12 +8,21 @@ pipeline {
|
||||
sh 'git clean -fd'
|
||||
}
|
||||
}
|
||||
stage('startup check') {
|
||||
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') {
|
||||
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'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user