Merge "Various fixes to blackduck job"
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 3298eba..f6737a5 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -80,7 +80,7 @@
 
     # matching repos that should be version tagged by the version-tag job
     # (basically the same as imagebuilder projects + helm charts + tools
-    version-tag-projects-regexp: '^(xos.*|helm-charts|automation-tools|cord-tester|chameleon|rcord|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|fabric|fabric-crossconnect|globalxos|hippie-oss|hss_db|hypercache|internetemulator|kubernetes-service|monitoring|olt-service|onos-service|openstack|progran|sdn-controller|simpleexampleservice|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vrouter|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr|att-workflow-driver|tt-workflow-driver|ves-agent|voltha-bbsim|openolt|sadis-server|kafka-topic-exporter|pyvoltha|voltha-adtran-adapter|voltha-openolt-adapter|voltha-openonu-adapter|plyxproto|voltha-protos|alpine-grpc-base|cordctl|voltha-go|voltha-helm-charts)$'
+    version-tag-projects-regexp: '^(xos.*|helm-charts|automation-tools|cord-tester|chameleon|rcord|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|fabric|fabric-crossconnect|globalxos|hippie-oss|hss_db|hypercache|internetemulator|kubernetes-service|monitoring|olt-service|onos-service|openstack|progran|sdn-controller|simpleexampleservice|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vrouter|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr|att-workflow-driver|tt-workflow-driver|ves-agent|voltha-bbsim|openolt|sadis-server|kafka-topic-exporter|pyvoltha|voltha-adtran-adapter|voltha-openolt-adapter|voltha-openonu-adapter|plyxproto|voltha-protos|alpine-grpc-base|cordctl|voltha-go|voltha-helm-charts|voltha-onos|device-management)$'
 
     # PyPI related publishing variables
     #
diff --git a/jjb/verify/device-management.yaml b/jjb/verify/device-management.yaml
new file mode 100644
index 0000000..e611365
--- /dev/null
+++ b/jjb/verify/device-management.yaml
@@ -0,0 +1,27 @@
+---
+# verification jobs for 'device-management' repo
+
+- project:
+    name: device-management
+    project: '{name}'
+
+    jobs:
+      - 'verify-device-management-jobs':
+          branch-regexp: '{supported-branches-regexp}'
+      - 'publish-device-management-jobs':
+          branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+    name: 'verify-device-management-jobs'
+    jobs:
+      - 'verify-licensed'
+      - 'tag-collision-reject':
+          dependency-jobs: 'verify_device-management_licensed'
+      - 'make-unit-test'
+
+- job-group:
+    name: 'publish-device-management-jobs'
+    jobs:
+      - 'docker-publish':
+          docker-repo: 'opencord'
+          dependency-jobs: 'version-tag'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
new file mode 100644
index 0000000..676bc97
--- /dev/null
+++ b/jjb/verify/voltha-onos.yaml
@@ -0,0 +1,29 @@
+---
+# verification jobs for 'voltha-onos' repo
+
+- project:
+    name: voltha-onos
+    project: '{name}'
+
+    jobs:
+      - 'verify-voltha-onos-jobs':
+          branch-regexp: '{supported-branches-regexp}'
+      - 'publish-voltha-onos-jobs':
+          branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+    name: 'verify-voltha-onos-jobs'
+    jobs:
+      - 'verify-licensed'
+      - 'tag-collision-reject':
+          dependency-jobs: 'verify_voltha-onos_licensed'
+      - 'make-unit-test':
+          unit-test-targets: 'build'
+          junit-allow-empty-results: true
+
+- job-group:
+    name: 'publish-voltha-onos-jobs'
+    jobs:
+      - 'docker-publish':
+          docker-repo: 'voltha'
+          dependency-jobs: 'version-tag'