set pipeline-branch and pipeline-script for all job definitions
* the change with the ID I5cbbddf25b84a9ad75430015dbe8b1d322e29044
switched most jobs from using pipeline scripts via dsl to pulling
them in via git
* in the aforementioned change, some pipeline definitions where missed,
especially in the jjb/verify, jjb/repos directories and
voltha-e2e.yaml file
* in addition to those, some pipelines in jjb/voltha-test/voltha.yaml
did not have any pipeline-script set and where therefore missed during
the refactoring as well
* this commit should repair all of the mentioned pipeline definitions by
always setting pipeline-branch and pipeline-script (except for jobs
which are commented out) in those files
Signed-off-by: Jan Klare <jan.klare@bisdn.de>
Change-Id: Ic3683b560c93e1bcfcaa2e895ded6a4b4e3c7ed8
Signed-off-by: Jan Klare <jan.klare@bisdn.de>
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index 91c5bdd..e38f410 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -42,12 +42,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- job-group:
name: 'verify-bbsim-sadis-server-jobs-voltha-2.11'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.11'
- job-group:
name: 'publish-bbsim-sadis-server-jobs'
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 4b85faa..9ea49c0 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -88,6 +88,7 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
testTargets: |
- target: sanity-bbsim-att
@@ -111,6 +112,7 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.11'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
testTargets: |
- target: sanity-bbsim-att
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index de4fad4..4428e44 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -43,18 +43,20 @@
jobs:
- 'voltha-patch-test':
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
-
+
- job-group:
name: 'verify-ofagent-jobs-voltha-2.11'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-
+ pipeline-branch: 'voltha-2.11'
+
- job-group:
name: 'verify-ofagent-jobs-voltha-2.12'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
# - job-group:
# name: 'verify-ofagent-jobs-voltha-2.8'
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index b1b80b5..d56d589 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -36,6 +36,7 @@
junit-allow-empty-results: true
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.11'
- job-group:
name: 'verify-voltha-api-server-jobs-voltha-2.8'
@@ -51,6 +52,7 @@
junit-allow-empty-results: true
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.8'
- job-group:
name: 'publish-voltha-api-server-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 7b508a0..28984ac 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -51,12 +51,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- job-group:
name: 'verify-voltha-go-jobs-voltha-2.11'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.11'
# - job-group:
# name: 'verify-voltha-go-jobs-voltha-2.8'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 6779887..8baf4cf 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -36,13 +36,15 @@
name: 'verify-voltha-onos-jobs-voltha-2.12'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- job-group:
name: 'verify-voltha-onos-jobs-voltha-2.11'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.11'
#- job-group:
# name: 'verify-voltha-onos-jobs-voltha-2.8'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index b0ddefe..9c490dc 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -53,12 +53,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- job-group:
name: 'verify-voltha-openolt-adapter-jobs-voltha-2.11'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.11'
- job-group:
name: 'publish-voltha-openolt-adapter-jobs'
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 574d1c1..2761bb9 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -50,12 +50,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- job-group:
name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.11'
#- job-group:
# name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index b62dd2b..1395136 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -44,12 +44,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- job-group:
name: 'verify-voltha-system-tests-jobs-voltha-2.11'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.11'
#- job-group:
# name: 'verify-voltha-system-tests-jobs-voltha-2.8'