Merge "Use 3.6.2 version of the openolt agent deb package for Edgecore OLTs Enable 3200G RadiSys OLT job and disable 1600G OLT job in its place as we have received latest debian package only for 3200G OLTs."
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 3e42f70..28ff99e 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -14,13 +14,13 @@
           aaa-version: '2.5.0.SNAPSHOT'
           aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.5.0-SNAPSHOT/aaa-app-2.5.0-20210709.230755-1.oar'
           olt-version: '5.0.0.SNAPSHOT'
-          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.0.0-SNAPSHOT/olt-app-5.0.0-20211124.164601-3.oar'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.0.0-SNAPSHOT/olt-app-5.0.0-20211206.223538-10.oar'
           dhcpl2relay-version: '2.6.0.SNAPSHOT'
           dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.6.0-SNAPSHOT/dhcpl2relay-app-2.6.0-20210709.230656-1.oar'
           igmpproxy-version: '2.4.0.SNAPSHOT'
           igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.4.0-SNAPSHOT/onos-app-igmpproxy-app-2.4.0-20210730.091648-1.oar'
           sadis-version: '5.5.0.SNAPSHOT'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.5.0-SNAPSHOT/sadis-app-5.5.0-20210709.225208-1.oar'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.5.0-SNAPSHOT/sadis-app-5.5.0-20211129.201111-2.oar'
           mcast-version: '2.5.0.SNAPSHOT'
           mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.5.0-SNAPSHOT/mcast-app-2.5.0-20210709.231023-1.oar'
           kafka-version: '2.8.0.SNAPSHOT'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 8f791dc..af074db 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -536,6 +536,7 @@
               teardown: true
               logging: true
           time-trigger: "H H/12 * * *"
+          timeout: 160
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.8'
@@ -662,6 +663,7 @@
               teardown: true
               logging: true
           olts: 2
+          timeout: 160
 
       - 'voltha-periodic-test':
           name: 'periodic-voltha-pm-data-test-bbsim'