[ONOS-7672] create jjb for CHO graph
Change-Id: I22fbb2c70020b4d508964cfb41a06948d0345164
diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index a9f5441..b5446fd 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -7,25 +7,6 @@
project-type: freestyle
-- init-station-plate: &init-station-plate
- name: init-station-plate
- station-type:
- - 'VM'
- - 'BM'
- - 'Fabric'
- - 'Fabric2'
- - 'Fabric3'
-
-- init-station-plate-clean: &init-station-plate-clean
- name: init-station-plate-clean
- clean-station-type:
- - 'BM'
- - 'Fabric'
- - 'Fabric2'
- - 'Fabric3'
- - 'Fabric4'
- - 'Fabric5'
-
- job-free-version-plate: &job-free-version-plate
name: job-free-version-plate
version:
@@ -91,43 +72,11 @@
artifacts: '*.jpg'
- job-template:
- name: test-station-log-cleanup-VM
- description: |
- <!-- Managed by Jenkins Job Builder -->
- clean up periodically ~/OnosSystemTest/TestON/logs - delete logs older than $DAYS_OLD days.
-
- <<: *test-free-job-boiler-plate
- <<: *inject-env-variable-plate
- properties:
-
- - build-discarder:
- num-to-keep: 30
-
- parameters:
-
- - string:
- name: 'DAYS_OLD'
- default: '15'
-
- - lf-infra-parameters:
- project: '{project}'
- branch: '{stream}'
- stream: '{stream}'
- lftools-version: '{lftools-version}'
-
- node: 'TestStation-VMs'
-
- triggers:
- - timed: '01 08 1,15 * *'
- builders:
-
- - shell: !include-raw-escape: vm-bm-clean-up.sh
-
-- job-template:
name: test-station-log-cleanup-{clean-station-type}
+ id: test-station-log-cleanup
description: |
<!-- Managed by Jenkins Job Builder -->
- clean up periodically ~/OnosSystemTest/TestON/logs - delete logs older than $DAYS_OLD days.
+ clean up periodically ~/OnosSystemTest/TestON/logs - delete logs older than {days_remove} days.
<<: *test-free-job-boiler-plate
<<: *inject-env-variable-plate
@@ -140,7 +89,7 @@
- string:
name: 'DAYS_OLD'
- default: '30'
+ default: '{days_remove}'
- lf-infra-parameters:
project: '{project}'
@@ -151,7 +100,7 @@
node: 'TestStation-{clean-station-type}s'
triggers:
- - timed: '01 08 1 * *'
+ - timed: '01 08 1{date} * *'
builders:
@@ -623,20 +572,39 @@
project-name: post-result-jobs
<<: *test-free-init-procedure-plate
- <<: *init-station-plate
jobs:
- - 'postjob-{station-type}'
+ - 'postjob-{station-type}':
+ station-type:
+ - 'VM'
+ - 'BM'
+ - 'Fabric'
+ - 'Fabric2'
+ - 'Fabric3'
+ - 'Fabric5'
- project:
name: cleanup-jobs
project-name: cleanup-jobs
<<: *test-free-init-procedure-plate
- <<: *init-station-plate
- <<: *init-station-plate-clean
jobs:
- - 'test-station-log-cleanup-VM'
- - 'test-station-log-cleanup-{clean-station-type}'
+ - 'test-station-log-cleanup':
+ clean-station-type:
+ - 'BM'
+ - 'Fabric'
+ - 'Fabric2'
+ - 'Fabric3'
+ - 'Fabric4'
+ days_remove: '30'
+ date: ''
+
+ - 'test-station-log-cleanup':
+ clean-station-type:
+ - 'VM'
+ - 'Fabric5'
+ days_remove: '15'
+ date: ',15'
+
- 'test-station-log-cleanup-CHO'
- project:
@@ -664,7 +632,7 @@
- 'init-CHO'
- 'running-CHO'
- 'post-CHO-{branch}':
- branch:
+ branch:
- 'master'
- '1.13'
- '1.12'
diff --git a/jjb/OnosSystemTest/onos-test-pipeline.yaml b/jjb/OnosSystemTest/onos-test-pipeline.yaml
index 64712a7..d84820c 100644
--- a/jjb/OnosSystemTest/onos-test-pipeline.yaml
+++ b/jjb/OnosSystemTest/onos-test-pipeline.yaml
@@ -358,6 +358,36 @@
branches:
- 'master'
+- job-template:
+ name: 'graph-generator-CHO'
+ description: |
+ <!-- Managed by Jenkins Job Builder -->
+ Generates the CHO graphs. <br />
+ Graphs are stored in pipeline-postjob-cho.
+
+ <<: *test-pipe-job-boiler-plate
+
+ parameters:
+ - text:
+ name: ONOSbranch
+ default: |
+ master
+ description: "Branch of the onos"
+
+ - lf-infra-parameters:
+ project: 'OnosSystemTest'
+ branch: 'master'
+ stream: 'master'
+ lftools-version: '<1.0.0'
+
+ pipeline-scm:
+ script-path: '{jenkins-path}/CHO_Graph_Generator'
+ scm:
+ - git:
+ url: '{gitURL}'
+ branches:
+ - 'master'
+
- project:
name: pipeline-trigger
project-name: pipeline-trigger
@@ -410,3 +440,4 @@
- 'manual-graph-generator-SCPF'
- 'manual-graph-generator-trend'
- 'manual-graph-generator-overall'
+ - 'graph-generator-CHO'