From f907f2453f2e63f8d74495d198f65590b99809ae Mon Sep 17 00:00:00 2001 From: Harrison Deng Date: Wed, 19 Jan 2022 02:45:49 -0600 Subject: [PATCH] Removed the queue step. --- Jenkinsfile | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a05f884..aa1044f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,23 +19,5 @@ pipeline { 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' - } - } - } } }