Remove the old way of post-CHO and enable time trigger on new post-CHO
Change-Id: I93796ecbaa0e3def513461cb50c389926cfc644d
diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index b5446fd..36c9768 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -406,60 +406,6 @@
- shell: !include-raw-escape: running-cho.sh
- job-template:
- name: post-CHO-{branch}
- <<: *test-free-job-boiler-plate
- properties:
- - lf-infra-properties:
- project: '{project}'
- build-days-to-keep: 7
-
- parameters:
-
- - lf-infra-parameters:
- project: '{project}'
- branch: '{stream}'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
-
- node: 'TestStation-Fabric5s'
- triggers:
- - timed: 'H/60 * * * *'
- wrappers:
- - inject:
- properties-file: '/var/jenkins/TestONOS.property'
- builders:
- - shell: !include-raw-escape: cho-post-sdn.sh
- publishers:
- - plot:
- - title: 'Network, Application and ONOS Events (per hour)'
- group: 'CHOTestMonkey'
- num-builds: '72'
- yaxis: 'Number of Events'
- style: line
- logarithmic-yaxis: true
- series:
- - file: 'event.csv'
- format: 'csv'
- - title: 'Failed Checks (per hour)'
- group: 'CHOTestMonkey'
- num-builds: '72'
- yaxis: 'Number of Failed Checks'
- style: line
- logarithmic-yaxis: true
- series:
- - file: 'failure.csv'
- format: 'csv'
- - title: 'Warnings, Errors and Exceptions from Logs (per hour)'
- group: 'CHOTestMonkey'
- num-builds: '72'
- yaxis: 'Number of Warnings or Errors'
- style: line
- logarithmic-yaxis: true
- series:
- - file: 'error.csv'
- format: 'csv'
-
-- job-template:
name: 'SR-log-{sr-version}'
<<: *test-free-job-boiler-plate
@@ -631,11 +577,6 @@
jobs:
- 'init-CHO'
- 'running-CHO'
- - 'post-CHO-{branch}':
- branch:
- - 'master'
- - '1.13'
- - '1.12'
- project:
name: log-pipeline
diff --git a/jjb/OnosSystemTest/onos-test-pipeline.yaml b/jjb/OnosSystemTest/onos-test-pipeline.yaml
index d84820c..f52550e 100644
--- a/jjb/OnosSystemTest/onos-test-pipeline.yaml
+++ b/jjb/OnosSystemTest/onos-test-pipeline.yaml
@@ -379,7 +379,8 @@
branch: 'master'
stream: 'master'
lftools-version: '<1.0.0'
-
+ triggers:
+ - timed: 'H/60 * * * *'
pipeline-scm:
script-path: '{jenkins-path}/CHO_Graph_Generator'
scm: