[ONOS-8015]: (JJB) Utilize node labels in Jenkins pipelines
Change-Id: I03f279e74c80a9c4a5a1f794b99ab8b1f24cbf0a
diff --git a/jjb/OnosSystemTest/onos-test-pipeline.yaml b/jjb/OnosSystemTest/onos-test-pipeline.yaml
index 5052ee2..31f25dd 100644
--- a/jjb/OnosSystemTest/onos-test-pipeline.yaml
+++ b/jjb/OnosSystemTest/onos-test-pipeline.yaml
@@ -110,7 +110,12 @@
1.14
1.13
1.12
- description: "ONOS and TestON versions to run on. Multiple branches supported."
+ description: "ONOS and TestON versions to run on."
+
+ - text:
+ name: Tests
+ default: ""
+ description: 'Specify the tests you want to run, if manual_run is selected.'
- string:
name: ONOSJAVAOPTS
@@ -122,13 +127,6 @@
default: ''
desciption: 'specific branch trying to checkout'
- - text:
- name: Tests
- default: |
- ""
-
- description: 'Specify the tests you want to run, if manual_run is selected.'
-
- lf-infra-parameters:
project: 'OnosSystemTest'
branch: 'master'
@@ -155,7 +153,7 @@
name: '{type}-pipeline-{version}'
description: '<!-- Managed by Jenkins Job Builder -->
This pipeline contains the test results and logs of {type} on ONOS {version}. <br /><br />
- Visit <a href="https://jenkins.onosproject.org/view/QA/job/all-pipeline-trigger/">all-pipeline-trigger</a> to trigger a build in this pipeline.<br />
+ Visit <a href="https://jenkins.onosproject.org/view/QA/job/master-trigger/">master-trigger</a> to trigger a build in this pipeline.<br />
<font color="red">Unless debugging, DO NOT MANUALLY BUILD THIS PIPELINE.</font><br /><br />
Created by Devin Lim - devin@opennetworking.org<br />
Copyright (c) 2017 Open Networking Foundation (ONF)'
@@ -168,7 +166,7 @@
name: TRIGGER_ONLY_WHEN_PREVIOUS_JOB_WAS_BUILT_HERE
default: 'DO_NOT_MANUALLY_TRIGGER_A_BUILD_HERE'
description: |
- <a href="https://jenkins.onosproject.org/view/QA/job/all-pipeline-trigger/">all-pipeline-trigger</a> triggers this pipeline automatically.
+ <a href="https://jenkins.onosproject.org/view/QA/job/master-trigger/">master-trigger</a> triggers this pipeline automatically.
- string:
name: 'Category'
default: '{type}'
@@ -181,6 +179,18 @@
description: |
Branch of the pipeline. Primarily used when triggered by the upstream master-trigger job.
+ - string:
+ name: 'TestStation'
+ default: ''
+ description: |
+ Test station to run this pipeline. Example: "TestStation-VMs".
+
+ - string:
+ name: 'NodeLabel'
+ default: ''
+ description: |
+ Node label of the test station that runs this pipeline. Example: "VM".
+
- lf-infra-parameters:
project: 'OnosSystemTest'
branch: 'master'