Merge "Always setting org.opencord.olt to DEBUG for scale test"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index a6c62c1..e89aa60 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -458,3 +458,25 @@
profile: '1T8GEM'
power-switch: True
pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
+
+ # Berlin pod with olt/onu - manual test job, voltha master build job
+ - 'build_pod_manual':
+ build-node: 'dt-berlin-community-pod'
+ config-pod: 'dt-berlin-pod-gpon'
+ release: 'master'
+ branch: 'master'
+ num-of-openonu: '2'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
+ profile: 'Default'
+
+ # Berlin pod1 test job - using voltha branch
+ - 'build_pod_test':
+ build-node: 'dt-berlin-community-pod'
+ config-pod: 'dt-berlin-pod-gpon'
+ profile: 'Default'
+ branch: 'master'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-test'
+
diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index ba236dd..46c845d 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -148,7 +148,7 @@
echo "on master, using default settings for kind-voltha"
fi
- if ! [[ "${gerritProject}" =~ ^(voltha-system-tests)\$ ]]; then
+ if ! [[ "${gerritProject}" =~ ^(voltha-system-tests|kind-voltha)\$ ]]; then
make -C $WORKSPACE/voltha/${gerritProject} DOCKER_REPOSITORY=voltha/ DOCKER_TAG=citest docker-build
docker images | grep citest
for image in \$(docker images -f "reference=*/*citest" --format "{{.Repository}}")
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index a89f908..b1e04b3 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -602,7 +602,7 @@
comment-contains-value: '^hardware test with delay$'
projects:
- project-compare-type: REG_EXP
- project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py|ofagent-go|voltha-onos)$'
+ project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py|ofagent-go|voltha-onos|kind-voltha)$'
branches:
- branch-compare-type: REG_EXP
branch-pattern: '{all-branches-regexp}'