summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@entrouvert.com>2019-07-02 10:16:12 (GMT)
committerFrédéric Péters <fpeters@entrouvert.com>2019-07-02 10:16:12 (GMT)
commitaafea3f370cf79e15ee4f98061f4a2fa1108617a (patch)
tree0b99316adc278c6e047ec1de60dd21f640b4470e
parentc3b768c021d7052efe94bbc16a2eaea51dfb920b (diff)
downloadcombo-aafea3f370cf79e15ee4f98061f4a2fa1108617a.zip
combo-aafea3f370cf79e15ee4f98061f4a2fa1108617a.tar.gz
combo-aafea3f370cf79e15ee4f98061f4a2fa1108617a.tar.bz2
don't compare combo-wip job name (it's combo-wip/whatever)
-rw-r--r--Jenkinsfile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index ce89c92..cec40de 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,8 +27,7 @@ pipeline {
echo "current branch: ${env.GIT_BRANCH}"
if (env.JOB_NAME == 'combo' && env.GIT_BRANCH == 'origin/master') {
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder -d stretch combo'
- }
- if (env.JOB_NAME == 'combo-wip' && env.GIT_BRANCH.startsWith('hotfix/')) {
+ } else if (env.GIT_BRANCH.startsWith('hotfix/')) {
sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder -d stretch --hotfix combo'
}
}