[ONOS-7990]: (JJB) Update Branch to Node Mapping in TestON Jenkins Pipelines
Change-Id: I1c7be6d57a48fe61e3d4af386096be3b948562cc
diff --git a/jjb/OnosSystemTest/onos-test-pipeline.yaml b/jjb/OnosSystemTest/onos-test-pipeline.yaml
index ebd169d..0ab997f 100644
--- a/jjb/OnosSystemTest/onos-test-pipeline.yaml
+++ b/jjb/OnosSystemTest/onos-test-pipeline.yaml
@@ -89,12 +89,6 @@
concurrent: true
- triggers:
- - timed: |
- TZ=America/Los_Angeles
- 30 19 * * 1,2,3,4,5
- 30 11 * * 6,7
-
pipeline-scm:
script-path: '{jenkins-path}/JenkinsfileTrigger'
scm:
@@ -142,17 +136,17 @@
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'
- - '2.1'
- - '2.0'
- - '1.15'
- - '1.14'
- - '1.13'
- - '1.12'
- description: "ONOS and TestON versions to run on."
+ - text:
+ name: branches
+ default: |
+ master
+ 2.1
+ 2.0
+ 1.15
+ 1.14
+ 1.13
+ 1.12
+ description: "ONOS and TestON versions to run on. Multiple branches supported."
- string:
name: ONOSJAVAOPTS
@@ -179,6 +173,12 @@
concurrent: false
+ triggers:
+ - timed: |
+ TZ=America/Los_Angeles
+ 30 19 * * 1,2,3,4,5
+ 30 11 * * 6,7
+
pipeline-scm:
script-path: '{jenkins-path}/{fileName}JenkinsfileTrigger'
scm: