Merge "xos-integration test pipeline to use 'testdir' parameter due to folder structure change"
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index f323bb5..eb0a914 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -78,7 +78,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|voltha-bbsim|openolt|sadis-server|kafka-topic-exporter|pyvoltha|voltha-adtran-adapter|voltha-openolt-adapter|voltha-openonu-adapter|plyxproto)$'
+ 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|openolt|sadis-server|kafka-topic-exporter|pyvoltha|voltha-adtran-adapter|voltha-openolt-adapter|voltha-openonu-adapter|plyxproto|voltha-protos)$'
# PyPI related publishing variables
#
diff --git a/jjb/verify/voltha-protos.yaml b/jjb/verify/voltha-protos.yaml
index 42b6b95..ada8bd0 100644
--- a/jjb/verify/voltha-protos.yaml
+++ b/jjb/verify/voltha-protos.yaml
@@ -8,6 +8,9 @@
jobs:
- 'verify-voltha-protos-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'post-merge-voltha-protos-jobs':
+ branch-regexp: '{supported-branches-regexp}'
+ pypi-index: 'pypi'
- job-group:
name: 'verify-voltha-protos-jobs'
@@ -20,3 +23,10 @@
- 'python-unit-test':
dependency-jobs: 'verify_voltha-protos_tag-collision'
# dependency-jobs: 'verify_voltha-protos_sonarqube'
+
+- job-group:
+ name: 'post-merge-voltha-protos-jobs'
+ jobs:
+ - 'pypi-publish':
+ project-regexp: '^{name}$'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/voltha-unit-test.yaml b/jjb/voltha-unit-test.yaml
index d6bf304..22b4456 100644
--- a/jjb/voltha-unit-test.yaml
+++ b/jjb/voltha-unit-test.yaml
@@ -35,7 +35,7 @@
choosing-strategy: gerrit
jenkins-ssh-credential: '{jenkins-ssh-credential}'
- node: 'ubuntu16.04-basebuild-2c-4g'
+ node: 'ubuntu16.04-basebuild-4c-8g'
project-type: freestyle
concurrent: true