summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJamo Luhrsen <jluhrsen@redhat.com>2017-05-17 14:21:14 -0700
committerJamo Luhrsen <jluhrsen@redhat.com>2017-05-25 13:12:05 -0700
commitdf5861a77f83e0fd738922afbeab0fd31284490c (patch)
tree91489d321bdd36c0500571400727f5eaaf98ee4d
parent6d275e8c16f706f12838c0970b148054df30512c (diff)
Trigger cperf not functest from apex-cperf-runner
Change-Id: I0f4325b8489edb18fb2e69ed987dd6ec7caeb3ea Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
-rw-r--r--jjb/apex/apex.yml8
-rw-r--r--jjb/apex/apex.yml.j28
2 files changed, 10 insertions, 6 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 549959097..49d25a9d7 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 dabcd955e..4f3a829cf 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: