Enable versioning for bbsim
Run tests as a developer would during build
Change-Id: I1581f5e193fe69f9b6c0a21847414e538e6687a6
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 94d103a..9a8c1ea 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -72,7 +72,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|ves-agent)$'
+ 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|ves-agent|voltha-bbsim)$'
# for matching files with file-include-regexp
all-files-regexp: '.*'
diff --git a/jjb/verify/voltha-bbsim.yaml b/jjb/verify/voltha-bbsim.yaml
index 0ecd412..567526c 100644
--- a/jjb/verify/voltha-bbsim.yaml
+++ b/jjb/verify/voltha-bbsim.yaml
@@ -13,8 +13,10 @@
name: 'verify-voltha-bbsim-jobs'
jobs:
- 'verify-licensed'
- - 'verify-sonarqube':
+ - 'tag-collision-reject':
dependency-jobs: 'verify_voltha-bbsim_licensed'
+ - 'verify-sonarqube':
+ dependency-jobs: 'verify_voltha-bbsim_tag-collision'
- 'voltha-bbsim-tests':
dependency-jobs: 'verify_voltha-bbsim_sonarqube'
@@ -77,8 +79,13 @@
make dep
+ # run tests as a developer would
+ make test
+
+ # generate Jenkins report
go test -v ./... 2>&1 | go-junit-report > $WORKSPACE/junit-report.xml
+ # generate Jenkins coverage
go test -coverprofile=coverage.txt -covermode=count ./...
gocover-cobertura < coverage.txt > $WORKSPACE/coverage.xml