Removed the queue step.

This commit is contained in:
Harrison Deng 2022-01-19 02:45:49 -06:00
parent 1d652fa3cd
commit f907f2453f

18
Jenkinsfile vendored
View File

@ -19,23 +19,5 @@ pipeline {
sh 'git reset --hard' sh 'git reset --hard'
} }
} }
stage('queue') {
steps {
sh 'git checkout master'
sh 'git reset --hard origin/master'
sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
sh 'git fetch --prune --prune-tags'
sh 'git pull --force origin master'
}
sh 'git clean -fd'
sh 'git merge --strategy-option theirs origin/delta'
sshagent(['2e60e630-b240-4c78-87ce-cb2c33d70180']) {
sh 'git push origin master'
sh 'git push origin --tags'
}
}
}
} }
} }