Make CHO tests to run on Fabric5s
Change-Id: Ia8aa4bda7435e922eff8d7e6d98c0a0fe232d0f5
diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index 305adf4..269e6fa 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -413,7 +413,7 @@
stream: '{stream}'
lftools-version: '{lftools-version}'
- node: 'TestStation-CHOs'
+ node: 'TestStation-Fabric5s'
wrappers:
- inject:
@@ -446,7 +446,7 @@
stream: '{stream}'
lftools-version: '{lftools-version}'
- node: 'TestStation-CHOs'
+ node: 'TestStation-Fabric5s'
triggers:
- reverse:
jobs: 'init-CHO'
@@ -458,7 +458,6 @@
- job-template:
name: post-CHO-{branch}
- id: post-CHO
<<: *test-free-job-boiler-plate
properties:
- lf-infra-properties:
@@ -473,15 +472,14 @@
stream: '{stream}'
lftools-version: '{lftools-version}'
- node: 'TestStation-{node}s'
+ node: 'TestStation-Fabric5s'
triggers:
- timed: 'H/60 * * * *'
wrappers:
- inject:
- properties-file: '/var{dir}/jenkins/TestONOS.property'
+ properties-file: '/var/jenkins/TestONOS.property'
builders:
-
- - shell: !include-raw-escape: cho-post{file}.sh
+ - shell: !include-raw-escape: cho-post-sdn.sh
publishers:
- plot:
- title: 'Network, Application and ONOS Events (per hour)'
@@ -665,21 +663,10 @@
jobs:
- 'init-CHO'
- 'running-CHO'
- - 'post-CHO':
+ - 'post-CHO-{branch}':
branch: 'master'
- node: 'CHO'
- dir: '/lib'
- file: ''
- - 'post-CHO':
branch: '1.13'
- node: 'CHO'
- dir: '/lib'
- file: ''
- - 'post-CHO':
branch: '1.12'
- node: 'Fabric5'
- dir: ''
- file: '-sdn'
- project:
name: log-pipeline