Merge "Adding required drivers to the software upgrade pipeline"
diff --git a/jjb/device-management.yaml b/jjb/device-management.yaml
index b4eb61b..cb929f5 100644
--- a/jjb/device-management.yaml
+++ b/jjb/device-management.yaml
@@ -13,7 +13,7 @@
testvm: 'tucson-pod'
config-pod: 'tucson-pod'
branch: 'master'
- oltDebVersion: 'openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb'
+ oltDebVersion: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
profile: 'Default'
time-trigger: "@daily"
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index c5b76f4..b887912 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -9,11 +9,11 @@
- 'software-upgrades-test':
name: 'periodic-software-upgrade-test-bbsim'
pipeline-script: 'voltha/master/software-upgrades.groovy'
- onosImg: 'andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix'
+ onos-image: 'andreacampanella/voltha-onos:olt-group-pkt-req-mcast-fix'
build-node: 'qct-pod4-node2'
code-branch: 'master'
aaa-version: '2.3.0.SNAPSHOT'
- aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.3.0-SNAPSHOT/aaa-app-2.3.0-20210311.091026-2.oar'
+ aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.3.0-SNAPSHOT/aaa-app-2.3.0-20210322.191830-3.oar'
olt-version: '4.4.0.SNAPSHOT'
olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.4.0-SNAPSHOT/olt-app-4.4.0-20210319.122447-8.oar'
dhcpl2relay-version: '2.4.0.SNAPSHOT'
@@ -88,7 +88,7 @@
- string:
name: onosImg
- default: ''
+ default: '{onos-image}'
description: 'ONOS Image to use'
- string:
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 4bfff33..d2f4b3c 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -69,7 +69,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-openonu-go-test-bbsim'
pipeline-script: 'voltha-openonu-go-test-bbsim.groovy'
- build-node: 'ubuntu16.04-basebuild-4c-8g'
+ build-node: 'ubuntu16.04-basebuild-8c-15g'
make-target: openonu-go-adapter-test
make-target-1t4gemtest: 1t4gem-openonu-go-adapter-test
make-target-1t8gemtest: 1t8gem-openonu-go-adapter-test
@@ -80,7 +80,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim'
pipeline-script: 'voltha-openonu-go-test-bbsim.groovy'
- build-node: 'ubuntu16.04-basebuild-4c-8g'
+ build-node: 'ubuntu16.04-basebuild-8c-15g'
make-target: openonu-go-adapter-multi-olt-test
make-target-1t4gemtest: 1t4gem-openonu-go-adapter-multi-olt-test
make-target-1t8gemtest: 1t8gem-openonu-go-adapter-multi-olt-test
@@ -181,8 +181,8 @@
name: 'verify_physical_voltha_patchset_auto'
build-node: 'tucson-pod'
config-pod: 'tucson-pod'
- oltDebVersionMaster: 'openolt_asfvolt16-3.3.2-f7feb4b828467ccc99104b56b29dc7a19aa2008b-40G-NNI.deb'
- oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
+ oltDebVersionMaster: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
+ oltDebVersionVoltha23: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
profile: 'Default'
default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
@@ -191,8 +191,8 @@
name: 'verify_physical_voltha_patchset_manual'
build-node: 'tucson-pod'
config-pod: 'tucson-pod'
- oltDebVersionMaster: 'openolt_asfvolt16-3.3.2-f7feb4b828467ccc99104b56b29dc7a19aa2008b-40G-NNI.deb'
- oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
+ oltDebVersionMaster: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
+ oltDebVersionVoltha23: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
profile: 'Default'
trigger-string: 'hardware test'
default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
@@ -203,8 +203,8 @@
name: 'verify_physical_voltha_patchset_manual_DT'
build-node: 'tucson-pod'
config-pod: 'tucson-pod-DT'
- oltDebVersionMaster: 'openolt_asfvolt16-3.3.2-f7feb4b828467ccc99104b56b29dc7a19aa2008b-40G-NNI.deb'
- oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
+ oltDebVersionMaster: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
+ oltDebVersionVoltha23: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
profile: 'Default'
pipeline-script: 'voltha-dt-physical-build-and-tests.groovy'
trigger-string: 'DT hardware test'
@@ -218,8 +218,8 @@
build-node: 'tucson-pod'
config-pod: 'tucson-pod'
manualBranch: 'master'
- oltDebVersionMaster: 'openolt_asfvolt16-3.3.2-f7feb4b828467ccc99104b56b29dc7a19aa2008b-40G-NNI.deb'
- oltDebVersionVoltha23: 'openolt_asfvolt16-3.2.0-fc10f0d035181d3125ffc6e7a60bf5328fcf5bfa-40G-NNI.deb'
+ oltDebVersionMaster: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
+ oltDebVersionVoltha23: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
profile: 'Default'
default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'