[ONOS-7658] Separate the BM/VM trigger jobs on Jenkins
Change-Id: I8036f79b8e03dcf27286d730cdc8a292b75927c5
diff --git a/jjb/OnosSystemTest/onos-test-pipeline.yaml b/jjb/OnosSystemTest/onos-test-pipeline.yaml
index f75691b..8d4b791 100644
--- a/jjb/OnosSystemTest/onos-test-pipeline.yaml
+++ b/jjb/OnosSystemTest/onos-test-pipeline.yaml
@@ -54,66 +54,20 @@
<!-- Managed by Jenkins Job Builder -->
all-pipeline-trigger can trigger any TestON test on any branch of ONOS and TestON, by running the test category pipeline that contains the test. <br />
This pipeline is triggered by timer for the nightly builds. <br />
- You may manually trigger this pipeline as well - provide the tests to run and the branch of ONOS and TestON. <br /> <br />
- Note: <i>The console output for this job does <b>not</b> contain any test result logs.</i><br />
- Visit the test category pipelines (such as <a href="https://jenkins.onosproject.org/view/QA/job/FUNC-pipeline-master/">FUNC-pipeline-master</a>) to view the test logs. <br /> <br />
Created by Devin Lim - devin@opennetworking.org<br />
Copyright (c) 2017 Open Networking Foundation (ONF)
- <<: *var-init-boiler-plate
<<: *test-pipe-job-boiler-plate
parameters:
- - bool:
- name: manual_run
- default: false
- description: |
- Check this option if you are manually running this job (you most likely are). <br />
- You must specify which tests to run in the text field below.
-
- - bool:
- name: PostResult
- default: false
- description: |
- Check this option if you want to update the results on the wiki. <br />
- When manually run, this will update the wiki pages corresponding to the tests that were run. <br />
- This option will always be selected during nightly builds.
-
- - bool:
- name: isOldFlow
- default: true
- description: |
- Check this option if you prefer to run the old flow rule over the new one. <br />
- * This only applies to SCPF tests.
-
- - choice:
- name: ONOSVersion
- choices:
- - 'master'
- - '1.13'
- - '1.12'
- - '1.11'
- description: "ONOS and TestON versions to run on."
-
- - string:
- name: ONOSJVMHeap
- default: "\"${{JAVA_OPTS:--Xms8G -Xmx8G}}\""
- description: 'ONOS cell JVM heap size setting.'
-
- - string:
- name: ONOSTag
- default: ''
- desciption: 'specific branch trying to checkout'
-
- text:
- name: Tests
+ name: machines
default: |
- {FUNC}
- {HA}
- {SCPF}
- {USECASE}
- description: 'Specify the tests you want to run, if manual_run is selected.'
+ vm
+ bm
+ fabric
+ description: 'Specify the machine-trigger you want to run.'
- lf-infra-parameters:
project: 'OnosSystemTest'
@@ -121,7 +75,7 @@
stream: 'master'
lftools-version: '<1.0.0'
- concurrent: false
+ concurrent: true
triggers:
- timed: |
@@ -138,18 +92,18 @@
- 'master'
- job-template:
- name: SR-pipeline-trigger
+ name: '{machine}-pipeline-trigger'
+ id: pipeline-trigger
description: |
<!-- Managed by Jenkins Job Builder -->
- SR-pipeline-trigger can trigger Segment Routing TestON test on any branch of ONOS and TestON, by running the test category pipeline that contains the test. <br />
+ {machine}-pipeline-trigger can trigger Segment Routing TestON test on any branch of ONOS and TestON, by running the test category pipeline that contains the test. <br />
This pipeline is triggered by timer for the nightly builds. <br />
You may manually trigger this pipeline as well - provide the tests to run and the branch of ONOS and TestON. <br /> <br />
Note: <i>The console output for this job does <b>not</b> contain any test result logs.</i><br />
- Visit the test category pipelines (such as <a href="https://jenkins.onosproject.org/view/QA/job/SR-pipeline-master/">SR-pipeline-master</a>) to view the test logs. <br /> <br />
+ Visit the test category pipelines (such as <a href="https://jenkins.onosproject.org/view/QA/job/FUNC-pipeline-master/">FUNC-pipeline-master</a>) to view the test logs. <br /> <br />
Created by Devin Lim - devin@opennetworking.org<br />
Copyright (c) 2017 Open Networking Foundation (ONF)
- <<: *var-init-boiler-plate
<<: *test-pipe-job-boiler-plate
parameters:
@@ -198,7 +152,7 @@
- text:
name: Tests
default: |
- {SR}
+ {testList}
description: 'Specify the tests you want to run, if manual_run is selected.'
@@ -210,13 +164,8 @@
concurrent: false
- triggers:
- - timed: |
- TZ=America/Los_Angeles
- 30 18 * * 1,2,3,4,5,6,7
-
pipeline-scm:
- script-path: '{jenkins-path}/SRJenkinsfileTrigger'
+ script-path: '{jenkins-path}/{fileName}JenkinsfileTrigger'
scm:
- git:
url: '{gitURL}'
@@ -408,11 +357,24 @@
project-name: pipeline-trigger
<<: *test-pipe-init-procedure-plate
+ <<: *var-init-boiler-plate
- build-node: 'ubuntu16.04-basebuild-8c-15g'
jobs:
- 'all-pipeline-trigger'
- - 'SR-pipeline-trigger'
+ - 'pipeline-trigger':
+ machine: 'vm'
+ testList: '{FUNC}\n{HA}'
+ fileName: 'VM_BM'
+
+ - 'pipeline-trigger':
+ machine: 'bm'
+ testList: '{SCPF}\n{USECASE}'
+ fileName: 'VM_BM'
+
+ - 'pipeline-trigger':
+ machine: 'fabric'
+ testList: '{SR}'
+ fileName: 'Fabric'
- project:
name: build-pipeline