From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Wed, 17 May 2017 21:21:14 +0000 (-0700)
Subject: Trigger cperf not functest from apex-cperf-runner
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F15%2F34915%2F6;p=releng.git

Trigger cperf not functest from apex-cperf-runner

Change-Id: I0f4325b8489edb18fb2e69ed987dd6ec7caeb3ea
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---

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: