[ONOS-7346] Ver.i
Change-Id: Ifc8d025540e742dc9632d549520b4078358b491e
diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index bebdfbe..b439440 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -1,7 +1,6 @@
---
# ONOS System Test Pipeline jobs
-# TODO: Change all the job names in Jenkins Pipeline script.
- test-free-job-boiler-plate: &test-free-job-boiler-plate
name: test-free-job-boiler-plate
@@ -189,7 +188,7 @@
triggers:
- gerrit:
- server-name: 'ONOS Project Gerrit'
+ server-name: 'OnosSystemTest Project Gerrit'
trigger-on:
- patchset-created-event:
exclude-drafts: false
@@ -203,11 +202,9 @@
project-pattern: '{project}'
branches:
- branch-compare-type: ANT
- branch-pattern:
- -'**/master'
+ branch-pattern: '**/master'
- branch-compare-type: ANT
- branch-pattern:
- -'**/onos-1.[11-20]'
+ branch-pattern: '**/onos-1.[11-20]'
wrappers:
- lf-infra-wrappers:
build-timeout: 1800
diff --git a/jjb/OnosSystemTest/onos-test-pipeline.yaml b/jjb/OnosSystemTest/onos-test-pipeline.yaml
index 0e2c520..adf5b4e 100644
--- a/jjb/OnosSystemTest/onos-test-pipeline.yaml
+++ b/jjb/OnosSystemTest/onos-test-pipeline.yaml
@@ -70,7 +70,7 @@
- bool:
name: isOldFlow
- default: false
+ default: true
description: |
Check this option if you prefer to run the old flow rule over the new one.
* This only applies to SCPF tests.