merge GIT_BRANCH and GERRIT_BRANCH into BRANCH

[releng.git] / jjb / cperf / cperf-ci-jobs.yml

diff --git a/jjb/cperf/cperf-ci-jobs.yml b/jjb/cperf/cperf-ci-jobs.yml
index 8843524..125937e 100644 (file)
--- a/jjb/cperf/cperf-ci-jobs.yml
+++ b/jjb/cperf/cperf-ci-jobs.yml
@@ -42,9 +42,11 @@
     concurrent: true
 
     properties:
+        - logrotate-default
         - throttle:
             enabled: true
             max-per-node: 1
+            option: 'project'
 
     wrappers:
         - build-name:
@@ -56,6 +58,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - '{pod}-defaults'
         - '{installer}-defaults'
         - cperf-parameter:
@@ -64,10 +67,7 @@
             docker-tag: '{docker-tag}'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     builders:
         - 'cperf-{testsuite}-builder'
@@ -118,8 +118,8 @@
             docker pull opnfv/cperf:$DOCKER_TAG
             robot_cmd="pybot -e exclude -v ODL_SYSTEM_IP:${CONTROLLER_IP} -v switch_count:100 -v loops:10 \
                               -v TOOLS_SYSTEM_IP:localhost -v duration_in_seconds:60"
-            robot_suite="/home/opnfv/repos/test/csit/suites/openflowplugin/Performance/010_Cbench.robot"
-            sudo docker run opnfv/cperf:$DOCKER_TAG ${robot_cmd} ${robot_suite}
+            robot_suite="/home/opnfv/repos/odl_test/csit/suites/openflowplugin/Performance/010_Cbench.robot"
+            docker run opnfv/cperf:$DOCKER_TAG ${robot_cmd} ${robot_suite}
 
 - builder:
     name: cperf-cleanup