Updated voltha-patch-test master jobs to use periodic-bbsim-tests pipeline
Change-Id: I98d4012433510aed5763bc245864c816b485e3b3
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index 2ce60d3..9ca6e61 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -38,7 +38,6 @@
name: 'verify-bbsim-sadis-server-jobs-master'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
- job-group:
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 37dfbae..45b6707 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -39,8 +39,20 @@
name: 'verify-bbsim-jobs-master'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+ testTargets: |
+ - target: sanity-bbsim-att
+ workflow: att
+ flags: ""
+ teardown: true
+ - target: sanity-bbsim-dt
+ workflow: dt
+ flags: ""
+ teardown: true
+ - target: sanity-bbsim-tt
+ workflow: tt
+ flags: ""
+ teardown: true
- job-group:
name: 'publish-bbsim-jobs'
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 9483d6e..09dac06 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -40,7 +40,6 @@
name: 'verify-ofagent-jobs-master'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
- job-group:
diff --git a/jjb/verify/voltctl.yaml b/jjb/verify/voltctl.yaml
index 220e0ce..e4821de 100644
--- a/jjb/verify/voltctl.yaml
+++ b/jjb/verify/voltctl.yaml
@@ -25,7 +25,6 @@
unit-test-keep-going: 'true'
dependency-jobs: 'verify_voltctl_tag-collision'
- 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
- job-group:
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index e4a4576..8a808a6 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -48,7 +48,6 @@
name: 'verify-voltha-go-jobs-master'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
- job-group:
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index ebe7c50..e947800 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -33,5 +33,4 @@
- job-group:
name: 'verify-voltha-helm-charts-jobs-master'
jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
+ - 'voltha-patch-test'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index d708a43..d85f8ef 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -34,7 +34,6 @@
name: 'verify-voltha-onos-jobs-master'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
- job-group:
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index ff3587b..7bb77c8 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -48,7 +48,6 @@
name: 'verify-voltha-openolt-adapter-jobs-master'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
- job-group:
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index e4e67e3..258ec5e 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -47,8 +47,24 @@
name: 'verify-voltha-openonu-adapter-go-jobs-master'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
+ testTargets: |
+ - target: sanity-kind-att
+ workflow: att
+ flags: ""
+ teardown: true
+ - target: sanity-kind-dt
+ workflow: dt
+ flags: ""
+ teardown: true
+ - target: sanity-kind-tt
+ workflow: tt
+ flags: ""
+ teardown: true
+ - target: 1t4gem-openonu-go-adapter-test
+ workflow: att
+ flags: ""
+ teardown: true
- job-group:
name: 'publish-voltha-openonu-adapter-go-jobs'
diff --git a/jjb/verify/voltha-openonu-adapter.yaml b/jjb/verify/voltha-openonu-adapter.yaml
index 21a1968..1388ae0 100644
--- a/jjb/verify/voltha-openonu-adapter.yaml
+++ b/jjb/verify/voltha-openonu-adapter.yaml
@@ -45,7 +45,6 @@
name: 'verify-voltha-openonu-adapter-jobs-master'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
- job-group:
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index b385e2f..c068b55 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -39,5 +39,4 @@
name: 'verify-voltha-system-tests-jobs-master'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/master/bbsim-tests.groovy'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'