diff options
| author |   Tim Rozet <trozet@redhat.com> | 2017-05-25 20:15:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-25 20:15:50 +0000 |
| commit | 198655778f1ed98fda9becb3c2289e4c3a8dc8e5 (patch) | |
| tree | a1b5a0c22e5a72ea03b878221d0641d968214e0c /jjb/apex | |
| parent | 20dffea627b102ba5588f249ef910c2ea0cd879f (diff) | |
| parent | df5861a77f83e0fd738922afbeab0fd31284490c (diff) | |
Merge "Trigger cperf not functest from apex-cperf-runner"
Diffstat (limited to 'jjb/apex')
| -rw-r--r-- | jjb/apex/apex.yml | 8 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 210511c37..1dff3b63a 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -374,16 +374,18 @@ node-parameters: false current-parameters: true predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= OPNFV_CLEAN=yes DEPLOY_SCENARIO={verify-scenario} kill-phase-on: FAILURE abort-all-job: true git-revision: false - multijob: - name: Functest - condition: ALWAYS + name: CPERF + condition: SUCCESSFUL projects: - - name: 'functest-apex-baremetal-daily-{stream}' + - name: 'cperf-apex-intel-pod2-daily-master' node-parameters: true current-parameters: false predefined-parameters: diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index ee707dc14..4f30d2ffa 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -374,16 +374,18 @@ node-parameters: false current-parameters: true predefined-parameters: | + GERRIT_BRANCH=$GERRIT_BRANCH + GERRIT_REFSPEC= OPNFV_CLEAN=yes DEPLOY_SCENARIO={verify-scenario} kill-phase-on: FAILURE abort-all-job: true git-revision: false - multijob: - name: Functest - condition: ALWAYS + name: CPERF + condition: SUCCESSFUL projects: - - name: 'functest-apex-baremetal-daily-{stream}' + - name: 'cperf-apex-intel-pod2-daily-master' node-parameters: true current-parameters: false predefined-parameters: |