VOL-3162 Forward etcd to a different port on ONF demo pod
Change-Id: I0e2b847325d835fd235d8b609585cfc46eeec42d
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 1b4dd59..532773d 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -865,6 +865,7 @@
Copyright (c) 2018 Open Networking Foundation (ONF)
<<: *test-pipe-job-boiler-plate
+ VolthaEtcdPort: '2379'
parameters:
- string:
@@ -966,6 +967,11 @@
default: '{with-kind}'
description: "The pods uses kind and a physical fabric thus port forward to the management is needed"
+ - string:
+ name: VolthaEtcdPort
+ default: '{VolthaEtcdPort}'
+ description: 'Localhost port that is forwarded to VOLTHA etcd'
+
concurrent: true
pipeline-scm:
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index aedb735..14dce79 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -147,6 +147,7 @@
configurePod: true
profile: 'Default'
time: '1'
+ VolthaEtcdPort: '9999'
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -170,6 +171,7 @@
configurePod: true
profile: 'Default'
time: '3'
+ VolthaEtcdPort: '9999'
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -196,6 +198,7 @@
configurePod: true
profile: '1T4GEM'
time: '4'
+ VolthaEtcdPort: '9999'
# Menlo pod test job - master test job uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -222,6 +225,7 @@
configurePod: true
profile: '1T8GEM'
time: '6'
+ VolthaEtcdPort: '9999'
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -251,6 +255,7 @@
configurePod: true
profile: '1T8GEM'
time: '7'
+ VolthaEtcdPort: '9999'
# Menlo pod test job - uses tech profile on voltha branch
- 'build_voltha_pod_test':
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index 97d8883..a330e6d 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -76,21 +76,13 @@
# We should change this. In the meantime here is a workaround.
set +e
- voltctl log level list
- if [ \$? -ne 0 ]
- then
- export KVSTORE="-e \$(kubectl -n voltha get svc voltha-etcd-cluster-client -o jsonpath='{.spec.clusterIP}:{.spec.ports[0].port}')"
- else
- export KVSTORE=""
- fi
-
# Remove noise from voltha-core logs
- voltctl \$KVSTORE log level set WARN read-write-core#github.com/opencord/voltha-go/db/model
- voltctl \$KVSTORE log level set WARN read-write-core#github.com/opencord/voltha-lib-go/v3/pkg/kafka
+ voltctl log level set WARN read-write-core#github.com/opencord/voltha-go/db/model
+ voltctl log level set WARN read-write-core#github.com/opencord/voltha-lib-go/v3/pkg/kafka
# Remove noise from openolt logs
- voltctl \$KVSTORE log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/db
- voltctl \$KVSTORE log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/probe
- voltctl \$KVSTORE log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/kafka
+ voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/db
+ voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/probe
+ voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/kafka
"""
}
}