Revert to using master images and configuration post GRPC migration
Change-Id: Ic92ac9d008d3296f708b87c1deb7c410c30d61e4
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 6e60b7d..72f2ed0 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -24,26 +24,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-test-bbsim'
code-branch: 'master'
- volthaHelmChartsChange: refs/changes/69/26569/11
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
time-trigger: "H H/23 * * *"
testTargets: |
- target: functional-single-kind
@@ -67,27 +48,7 @@
name: 'periodic-voltha-multiple-olts-test-bbsim'
code-branch: 'master'
olts: 2
- volthaHelmChartsChange: refs/changes/69/26569/11
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
- --set onu=2,pon=2
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
time-trigger: "H H/23 * * *"
testTargets: |
- target: functional-multi-olt
@@ -158,27 +119,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multi-uni-test-bbsim'
code-branch: 'master'
- volthaHelmChartsChange: refs/changes/69/26569/11
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
- --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
time-trigger: "H H/23 * * *"
testTargets: |
- target: functional-single-kind-multiuni-att
@@ -198,27 +139,7 @@
name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim'
code-branch: 'master'
olts: 2
- volthaHelmChartsChange: refs/changes/69/26569/11
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
- --set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
time-trigger: "H H/23 * * *"
testTargets: |
- target: functional-multiuni-multiolt-att
@@ -239,27 +160,7 @@
name: 'periodic-voltha-multi-uni-test-bbsim-2.8'
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
code-branch: 'voltha-2.8'
- volthaHelmChartsChange: refs/changes/69/26569/11
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
- --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF
+ extraHelmFlags: '--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
time-trigger: "H H/23 * * *"
testTargets: |
- target: functional-single-kind-multiuni-att
@@ -298,30 +199,10 @@
timeout: 180
# openonu Go periodic tests
-
- 'voltha-periodic-test':
name: 'periodic-voltha-openonu-go-test-bbsim'
code-branch: 'master'
- volthaHelmChartsChange: refs/changes/69/26569/11
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
time-trigger: "H H/12 * * *"
logLevel: 'DEBUG'
testTargets: |
@@ -515,27 +396,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim'
code-branch: 'master'
- volthaHelmChartsChange: refs/changes/69/26569/11
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
- --set onu=2,pon=2
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
olts: 2
logLevel: 'DEBUG'
testTargets: |
@@ -697,27 +558,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-pm-data-test-bbsim'
code-branch: 'master'
- volthaHelmChartsChange: refs/changes/69/26569/11
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
- --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
time-trigger: "H H/23 * * *"
logLevel: 'DEBUG'
testTargets: |
@@ -783,28 +624,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim'
code-branch: 'master'
- volthaHelmChartsChange: refs/changes/69/26569/11
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
- --set onu=2,pon=2
- --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
olts: 2
timeout: 180
logLevel: 'DEBUG'
@@ -896,28 +716,7 @@
name: 'periodic-voltha-etcd-test'
build-node: 'ubuntu18.04-basebuild-4c-8g'
code-branch: 'master'
- volthaHelmChartsChange: refs/changes/69/26569/11
-
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
- --set onu=2,pon=2
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
time-trigger: "H H/12 * * *"
testTargets: |
- target: sanity-multi-kind
@@ -942,28 +741,7 @@
name: 'periodic-voltha-sanity-test-multi-runs'
code-branch: 'master'
time-trigger: "H H/23 * * *"
- volthaHelmChartsChange: refs/changes/69/26569/11
-
- gerritProject: voltctl
- gerritRefspec: refs/changes/83/26983/4
- extraHelmFlags: >
- --set global.image_tag=master
- --set onos-classic.image.tag=master
- --set voltha.images.rw_core.repository=volthacore/voltha-rw-core
- --set voltha.images.rw_core.tag=grpc_v1
- --set voltha-adapter-openonu.images.adapter_open_onu_go.repository=volthacore/voltha-openonu-adapter-go
- --set voltha-adapter-openonu.images.adapter_open_onu_go.tag=grpc_v1
- --set voltha-adapter-openolt.images.adapter_open_olt.repository=volthacore/voltha-openolt-adapter
- --set voltha-adapter-openolt.images.adapter_open_olt.tag=grpc_v1
- --set voltha.images.ofagent.repository=volthacore/voltha-ofagent-go
- --set voltha.images.ofagent.tag=grpc_v1
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openolt.adapter_open_olt.endpoints.adapter_endpoint=voltha-voltha-adapter-openolt-api.voltha.svc:50060
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.core_endpoint=voltha-voltha-core.voltha.svc:55558
- --set voltha-adapter-openonu.adapter_open_onu.endpoints.adapter_endpoint=voltha-voltha-adapter-openonu-api.voltha.svc:50060
- --set services.kafka.cluster.address=voltha-infra-kafka.default.svc:9092
- --set services.etcd.address=voltha-infra-etcd.default.svc:2379
- --set onu=2,pon=2
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2'
testTargets: |
- target: sanity-kind
workflow: att