Revert "Trying ONOS 2.5 based image in periodic tests"
This reverts commit ac21e15d4dbe74ddea3557fd30fe0deeafbcac38.
Reason for revert: onos-2.5 is voltha-onos master
Change-Id: Ic7b1959098f4e091f8fe4d741f3b43bb16de89b9
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 6ab32d9..7ba6eb5 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -24,7 +24,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-test-bbsim'
code-branch: 'master'
- extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5'
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
time-trigger: "H H/23 * * *"
testTargets: |
- target: functional-single-kind
@@ -48,7 +48,7 @@
name: 'periodic-voltha-multiple-olts-test-bbsim'
code-branch: 'master'
olts: 2
- extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5 --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
@@ -88,7 +88,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-openonu-go-test-bbsim'
code-branch: 'master'
- extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5'
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
time-trigger: "H H/12 * * *"
logLevel: 'DEBUG'
testTargets: |
@@ -133,7 +133,7 @@
name: 'patchset-voltha-openonu-go-test-bbsim'
trigger-comment: "voltha test openonu singleolt"
code-branch: '$GERRIT_BRANCH'
- extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5'
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
gerrit-project: '$GERRIT_PROJECT'
gerritRefspec: '$GERRIT_REFSPEC'
logLevel: 'DEBUG'
@@ -192,7 +192,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim'
code-branch: 'master'
- extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5 --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: |
@@ -260,7 +260,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-pm-data-test-bbsim'
code-branch: 'master'
- extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.repository=andreacampanella/voltha-onos --set onos-classic.image.tag=voltha-onos-2.5 --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: |
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index ca5fc69..5424195 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -105,7 +105,7 @@
onosReplicas: 3
atomixReplicas: 3
extraHelmFlags: '--set authRetry=true,dhcpRetry=true --set global.rw_core.core_timeout=60s --set global.log_correlation.enabled=true -f /home/jenkins/voltha-scale/voltha-values.yaml '
- onosImg: andreacampanella/voltha-onos:voltha-onos-2.5
+ onosImg: andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix
# multi-stack jobs
- 'voltha-scale-measurements':