run xos-unit-test on more repos, fix test
Change-Id: Ic4d5f5b45f12752cb5128362b2b4ccd3d4869654
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
new file mode 100644
index 0000000..55a42bd
--- /dev/null
+++ b/jjb/verify/fabric-crossconnect.yaml
@@ -0,0 +1,24 @@
+---
+# verification jobs for 'fabric-crossconnect' repo
+
+- project:
+ name: fabric-crossconnect
+ project: '{name}'
+
+ jobs:
+ - 'verify-fabric-crossconnect-jobs':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'verify-fabric-crossconnect-jobs'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject':
+ dependency-jobs: 'verify_fabric-crossconnect_licensed'
+ - 'verify-sonarqube':
+ dependency-jobs: 'verify_fabric-crossconnect_tag-collision'
+ - 'xos-unit-test':
+ dependency-jobs: 'verify_fabric-crossconnect_sonarqube'
+# - 'api-test':
+# dependency-jobs: 'verify_fabric-crossconnect_unit-test'
+# pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index afea07c..778ffe3 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -17,6 +17,8 @@
dependency-jobs: 'verify_fabric_licensed'
- 'verify-sonarqube':
dependency-jobs: 'verify_fabric_tag-collision'
- - 'api-test':
+ - 'xos-unit-test':
dependency-jobs: 'verify_fabric_sonarqube'
+ - 'api-test':
+ dependency-jobs: 'verify_fabric_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/onos-service.yaml b/jjb/verify/onos-service.yaml
index 59027ba..da64670 100644
--- a/jjb/verify/onos-service.yaml
+++ b/jjb/verify/onos-service.yaml
@@ -17,6 +17,8 @@
dependency-jobs: 'verify_onos-service_licensed'
- 'verify-sonarqube':
dependency-jobs: 'verify_onos-service_tag-collision'
- - 'api-test':
+ - 'xos-unit-test':
dependency-jobs: 'verify_onos-service_sonarqube'
+ - 'api-test':
+ dependency-jobs: 'verify_onos-service_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'
diff --git a/jjb/verify/vnaas.yaml b/jjb/verify/vnaas.yaml
new file mode 100644
index 0000000..1516b90
--- /dev/null
+++ b/jjb/verify/vnaas.yaml
@@ -0,0 +1,25 @@
+---
+# verification jobs for 'vnaas' repo
+
+- project:
+ name: vnaas
+ project: '{name}'
+
+ jobs:
+ - 'verify-vnaas-jobs':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'verify-vnaas-jobs'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject':
+ dependency-jobs: 'verify_vnaas_licensed'
+ - 'verify-sonarqube':
+ dependency-jobs: 'verify_vnaas_tag-collision'
+ - 'xos-unit-test':
+ dependency-jobs: 'verify_vnaas_sonarqube'
+# - 'api-test':
+# dependency-jobs: 'verify_vnaas_unit-test'
+# pipeline_script: 'all-xos-api-test-helm.groovy'
+#
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index a66bf5a..d801e06 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -17,6 +17,8 @@
dependency-jobs: 'verify_vrouter_licensed'
- 'verify-sonarqube':
dependency-jobs: 'verify_vrouter_tag-collision'
- - 'api-test':
+ - 'xos-unit-test':
dependency-jobs: 'verify_vrouter_sonarqube'
+ - 'api-test':
+ dependency-jobs: 'verify_vrouter_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'