ydeng/rsemcs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed setup stage and now only run queue stage on delta branch.

Browse Source
This commit is contained in:
Harrison Deng 2022-01-20 03:03:44 -06:00
parent ed23d5190e
commit 04996cc087
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Jenkinsfile vendored
View File

@ -1,13 +1,6 @@
pipeline { pipeline {
agent any agent any
stages { stages {
stage('setup') {
steps {
sh 'git checkout delta'
sh 'git reset --hard origin/delta'
sh 'git clean -fd'
}
}
stage('startup and shutdown check') { stage('startup and shutdown check') {
steps { steps {
sh './testrun.sh' sh './testrun.sh'
@ -16,6 +9,9 @@ pipeline {
} }
} }
stage('queue') { stage('queue') {
when {
branch '**/delta'
}
steps { steps {
checkout([$class: 'GitSCM', branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[credentialsId: '359ebf7c-e2b9-45ec-992c-ff8d5549deb6', url: 'git@dev.sys.reslate.xyz:ydeng/rsemcs.git']]]) 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' sh 'git merge --strategy-option theirs origin/delta'