Consistency pass on naming in JJB
- Name of the pipeline script when parameterized: `pipeline-script`
- Name of executor the job is running on: `build-node` (or `buildNode` if
in a pipeline job)
Change-Id: Id069a2d3f17dc5dbd7259e0ed046b72017da0538
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 5ee9b93..f2fbc43 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -23,7 +23,7 @@
unit-test-targets: 'test'
unit-test-keep-going: 'true'
- 'voltha-patch-test':
- pipeline: 'voltha-bbsim-tests.groovy'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
name: 'publish-bbsim-jobs'
diff --git a/jjb/verify/helm-charts.yaml b/jjb/verify/helm-charts.yaml
index 3c119c6..137586b 100644
--- a/jjb/verify/helm-charts.yaml
+++ b/jjb/verify/helm-charts.yaml
@@ -32,4 +32,4 @@
name: 'post-merge-helm-charts-jobs'
jobs:
- 'triggered-api-test':
- pipeline_script: 'chart-api-test-helm.groovy'
+ pipeline-script: 'chart-api-test-helm.groovy'
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index 736fa69..2e379fc 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -24,7 +24,7 @@
unit-test-keep-going: 'true'
junit-allow-empty-results: true
- 'voltha-patch-test':
- pipeline: 'voltha-bbsim-tests.groovy'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
name: 'publish-voltha-api-server-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index f7fa935..0cbb585 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -33,7 +33,7 @@
unit-test-keep-going: 'true'
- 'voltha-patch-test':
buildImages: true
- pipeline: 'voltha-bbsim-tests.groovy'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
name: 'publish-voltha-go-jobs'
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index f0f48a2..a4b7a9d 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -20,5 +20,5 @@
- 'voltha-patch-test':
dependency-jobs: 'verify_voltha-helm-charts_helm-lint'
build-timeout: 20
- pipeline: 'voltha-bbsim-tests.groovy'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 7d1aa71..893ec19 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -32,7 +32,7 @@
junit-allow-empty-results: true
build-node: 'ubuntu16.04-basebuild-2c-4g'
- 'voltha-patch-test':
- pipeline: 'voltha-bbsim-tests.groovy'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
name: 'publish-voltha-openolt-adapter-jobs'
diff --git a/jjb/verify/voltha-openonu-adapter.yaml b/jjb/verify/voltha-openonu-adapter.yaml
index 903e2b6..7d7ec6d 100644
--- a/jjb/verify/voltha-openonu-adapter.yaml
+++ b/jjb/verify/voltha-openonu-adapter.yaml
@@ -23,7 +23,7 @@
junit-allow-empty-results: true
build-timeout: 15
- 'voltha-patch-test':
- pipeline: 'voltha-bbsim-tests.groovy'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
name: 'publish-voltha-openonu-adapter-jobs'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index d08ec2f..724589c 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -21,5 +21,5 @@
junit-allow-empty-results: true
- 'voltha-patch-test':
build-timeout: 20
- pipeline: 'voltha-bbsim-tests.groovy'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
dependency-jobs: 'verify_voltha-system-tests_unit-test'
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index 62340c4..93e0e1e 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -33,7 +33,7 @@
build-timeout: 45
build-node: 'ubuntu16.04-basebuild-2c-4g'
- 'api-test':
- pipeline_script: 'xos-core.groovy'
+ pipeline-script: 'xos-core.groovy'
- job-group:
name: 'publish-xos-jobs'