(jjb) Adding timeout to Jenkins TestON Pipelines
Change-Id: Ie14383bd210261561a90c1fc8002c132efe28af7
diff --git a/jjb/OnosSystemTest/onos-test-pipeline.yaml b/jjb/OnosSystemTest/onos-test-pipeline.yaml
index 80e6238..a258eb8 100644
--- a/jjb/OnosSystemTest/onos-test-pipeline.yaml
+++ b/jjb/OnosSystemTest/onos-test-pipeline.yaml
@@ -79,11 +79,10 @@
Leave this unchecked if simulating a nightly test run.
- string:
- name: simulate_day
- default: ""
+ name: TimeOut
+ default: '1410'
description: |
- Enter a day prefix (first 3 letters of a day, lowercase) to simulate running a nightly test on that day. Leave this field empty to default to today.<br />
- The "manual_run" parameter must not be selected for this to take effect.
+ Minutes until the entire pipeline times out. Default: 23 hours 30 minutes. This value is also passed to the downstream jobs.
- bool:
name: PostResult
@@ -93,24 +92,10 @@
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.
-
- 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."
+ default: ""
+ description: "ONOS and TestON version to run on."
- text:
name: Tests
@@ -118,6 +103,13 @@
description: 'Specify the tests you want to run, if manual_run is selected.'
- string:
+ name: simulate_day
+ default: ""
+ description: |
+ Enter a day prefix (first 3 letters of a day, lowercase) to simulate running a nightly test on that day. Leave this field empty to default to today.<br />
+ The "manual_run" parameter must not be selected for this to take effect.
+
+ - string:
name: ONOSJAVAOPTS
default: "\"${{JAVA_OPTS:--Xms8G -Xmx8G -XX:+UseG1GC -XX:MaxGCPauseMillis=200 -Dkaraf.log.console=INFO -Dds.lock.timeout.milliseconds=60000}}\""
description: 'ONOS cell JAVA_OPTS setting.'
@@ -133,7 +125,7 @@
stream: 'master'
lftools-version: '<1.0.0'
- concurrent: false
+ concurrent: true
triggers:
- timed: |
@@ -163,17 +155,17 @@
parameters:
- - text:
- name: 'TestsOverride'
- default: ''
- description: "Add a list of tests here to run, which overrides the test list from the .property file."
-
- bool:
name: 'OnlyRefreshGraphs'
default: false
description: "Check this option to refresh the graphs without running any of the tests."
- string:
+ name: 'TimeOut'
+ default: '1410'
+ description: 'Minutes until the entire pipeline times out. Default: 23 hours 30 minutes. This value is usually passed from the upstream <a href="https://jenkins.onosproject.org/view/QA/job/master-trigger/">master-trigger</a> job.'
+
+ - string:
name: 'TestStation'
default: ''
description: 'Name of the test station to run this pipeline. Example: "TestStation-VMs".'
@@ -183,6 +175,11 @@
default: ''
description: 'Node label of the test station that runs this pipeline. Example: "VM".'
+ - text:
+ name: 'TestsOverride'
+ default: ''
+ description: "Add a list of tests here to run, which overrides the test list from the .property file."
+
- string:
name: 'Category'
default: '{type}'