Updated pipelines for Voltha-2.8 release

Change-Id: I53ca9a5418a73299165bbc00ad655288734fd35e
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 7deb46f..8e809b1 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -11,24 +11,24 @@
           pipeline-script: 'voltha/master/software-upgrades.groovy'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
           code-branch: 'master'
-          aaa-version: '2.4.0.SNAPSHOT'
-          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.4.0-SNAPSHOT/aaa-app-2.4.0-20210604.083415-3.oar'
-          olt-version: '4.5.0.SNAPSHOT'
-          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.5.0-SNAPSHOT/olt-app-4.5.0-20210701.210511-9.oar'
-          dhcpl2relay-version: '2.5.0.SNAPSHOT'
-          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.5.0-SNAPSHOT/dhcpl2relay-app-2.5.0-20210621.141815-7.oar'
-          igmpproxy-version: '2.3.0.SNAPSHOT'
-          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.3.0-SNAPSHOT/onos-app-igmpproxy-app-2.3.0-20210604.083403-4.oar'
-          sadis-version: '5.4.0.SNAPSHOT'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.4.0-SNAPSHOT/sadis-app-5.4.0-20210625.184654-7.oar'
-          mcast-version: '2.4.0.SNAPSHOT'
-          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0-SNAPSHOT/mcast-app-2.4.0-20210604.083722-5.oar'
-          kafka-version: '2.7.0.SNAPSHOT'
-          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0-SNAPSHOT/kafka-2.7.0-20210604.093616-4.oar'
-          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.0'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.1'
-          rw-core-image: 'voltha/voltha-rw-core:2.9.2'
-          ofagent-image: 'voltha/voltha-ofagent-go:1.6.3'
+          aaa-version: '2.4.0'
+          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.4.0/aaa-app-2.4.0.oar'
+          olt-version: '4.5.0'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.5.0/olt-app-4.5.0.oar'
+          dhcpl2relay-version: '2.5.0'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.5.0/dhcpl2relay-app-2.5.0.oar'
+          igmpproxy-version: '2.3.0'
+          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.3.0/onos-app-igmpproxy-app-2.3.0.oar'
+          sadis-version: '5.4.0'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.4.0/sadis-app-5.4.0.oar'
+          mcast-version: '2.4.0'
+          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
+          kafka-version: '2.7.0'
+          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.1'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.2'
+          rw-core-image: 'voltha/voltha-rw-core:2.9.3'
+          ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
           onu-image-version: 'BBSM_IMG_00002'
           onu-image-url: 'http://bbsim0:50074/images/software-image.img'
           onu-image-vendor: 'BBSM'
@@ -37,221 +37,38 @@
           onu-image-crc: '0'
           time-trigger: "H H/23 * * *"
 
-      - 'software-upgrades-test-legacy':
-          name: 'periodic-software-upgrade-test-bbsim-2.7'
-          pipeline-script: 'voltha/voltha-2.7/software-upgrades.groovy'
+      - 'software-upgrades-test':
+          name: 'periodic-software-upgrade-test-bbsim-2.8'
+          pipeline-script: 'voltha/voltha-2.8/software-upgrades.groovy'
           build-node: 'ubuntu18.04-basebuild-8c-15g'
-          code-branch: 'voltha-2.7'
-          aaa-version: '2.3.0'
-          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.3.0/aaa-app-2.3.0.oar'
-          olt-version: '4.4.0'
-          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.4.0/olt-app-4.4.0.oar'
-          dhcpl2relay-version: '2.4.0'
-          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.4.0/dhcpl2relay-app-2.4.0.oar'
-          igmpproxy-version: '2.2.0'
-          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.2.0/onos-app-igmpproxy-app-2.2.0.oar'
-          sadis-version: '5.3.0'
-          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.3.0/sadis-app-5.3.0.oar'
-          mcast-version: '2.3.2'
-          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.3.2/mcast-app-2.3.2.oar'
-          kafka-version: '2.6.0'
-          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.6.0/kafka-2.6.0.oar'
-          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.1.8'
-          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.2.14'
-          rw-core-image: 'voltha/voltha-rw-core:2.7.0'
-          ofagent-image: 'voltha/voltha-ofagent-go:1.5.2'
-          onu-image-name: 'software-image.img'
-          onu-image-url: 'http://bbsim0:50074/images'
-          onu-image-version: 'v1.0.0'
+          code-branch: 'voltha-2.8'
+          aaa-version: '2.4.0'
+          aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.4.0/aaa-app-2.4.0.oar'
+          olt-version: '4.5.0'
+          olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/4.5.0/olt-app-4.5.0.oar'
+          dhcpl2relay-version: '2.5.0'
+          dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.5.0/dhcpl2relay-app-2.5.0.oar'
+          igmpproxy-version: '2.3.0'
+          igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.3.0/onos-app-igmpproxy-app-2.3.0.oar'
+          sadis-version: '5.4.0'
+          sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.4.0/sadis-app-5.4.0.oar'
+          mcast-version: '2.4.0'
+          mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.4.0.oar'
+          kafka-version: '2.7.0'
+          kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.7.0/kafka-2.7.0.oar'
+          adapter-open-olt-image: 'voltha/voltha-openolt-adapter:3.5.1'
+          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.2'
+          rw-core-image: 'voltha/voltha-rw-core:2.9.3'
+          ofagent-image: 'voltha/voltha-ofagent-go:1.6.5'
+          onu-image-version: 'BBSM_IMG_00002'
+          onu-image-url: 'http://bbsim0:50074/images/software-image.img'
+          onu-image-vendor: 'BBSM'
+          onu-image-activate-on-success: 'false'
+          onu-image-commit-on-success: 'false'
           onu-image-crc: '0'
-          onu-image-local-dir: '/tmp'
           time-trigger: "H H/23 * * *"
 
 - job-template:
-    id: 'software-upgrades-test-legacy'
-    name: '{name}'
-    sandbox: true
-    volthaSystemTestsChange: ''
-    volthaHelmChartsChange: ''
-    kindVolthaChange: ''
-
-    description: |
-      <!-- Managed by Jenkins Job Builder -->
-      Created by {id} job-template from ci-management/jjb/software-upgrades.yaml  <br /><br />
-      E2E Validation for Voltha 2.X
-    properties:
-      - cord-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-          artifact-num-to-keep: '{artifact-num-to-keep}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
-    parameters:
-      - string:
-          name: buildNode
-          default: '{build-node}'
-          description: 'Name of the Jenkins node to run the job on'
-
-      - string:
-          name: extraHelmFlags
-          default: ''
-          description: 'Helm flags to pass to every helm install command'
-
-      - string:
-          name: volthaSystemTestsChange
-          default: ''
-          description: 'Download a change for gerrit in the voltha-system-tests repo, example value: "refs/changes/79/18779/13"'
-
-      - string:
-          name: volthaHelmChartsChange
-          default: ''
-          description: 'Download a change for gerrit in the voltha-helm-charts repo, example value: "refs/changes/79/18779/13"'
-
-      - string:
-          name: branch
-          default: '{code-branch}'
-          description: 'Name of the branch to use'
-
-      # deprecated params (not used in master, remove after 2.6 support is dropped)
-      - string:
-          name: kindVolthaChange
-          default: ''
-          description: 'Download a change for gerrit in the kind-voltha repo, example value: "refs/changes/32/19132/1"'
-
-      - string:
-          name: onosImg
-          default: ''
-          description: 'ONOS Image to use'
-
-      - string:
-          name: aaaVer
-          default: '{aaa-version}'
-          description: 'ONOS AAA App Version to Test Upgrade'
-
-      - string:
-          name: aaaOarUrl
-          default: '{aaa-oar-url}'
-          description: 'ONOS AAA App OAR File Url'
-
-      - string:
-          name: oltVer
-          default: '{olt-version}'
-          description: 'ONOS OLT App Version to Test Upgrade'
-
-      - string:
-          name: oltOarUrl
-          default: '{olt-oar-url}'
-          description: 'ONOS OLT App OAR File Url'
-
-      - string:
-          name: dhcpl2relayVer
-          default: '{dhcpl2relay-version}'
-          description: 'ONOS DHCP L2 Relay App Version to Test Upgrade'
-
-      - string:
-          name: dhcpl2relayOarUrl
-          default: '{dhcpl2relay-oar-url}'
-          description: 'ONOS DHCP L2 Relay App OAR File Url'
-
-      - string:
-          name: igmpproxyVer
-          default: '{igmpproxy-version}'
-          description: 'ONOS Igmp Proxy App Version to Test Upgrade'
-
-      - string:
-          name: igmpproxyOarUrl
-          default: '{igmpproxy-oar-url}'
-          description: 'ONOS Igmp Proxy App OAR File Url'
-
-      - string:
-          name: sadisVer
-          default: '{sadis-version}'
-          description: 'ONOS Sadis App Version to Test Upgrade'
-
-      - string:
-          name: sadisOarUrl
-          default: '{sadis-oar-url}'
-          description: 'ONOS Sadis App OAR File Url'
-
-      - string:
-          name: mcastVer
-          default: '{mcast-version}'
-          description: 'ONOS MCast App Version to Test Upgrade'
-
-      - string:
-          name: mcastOarUrl
-          default: '{mcast-oar-url}'
-          description: 'ONOS MCast App OAR File Url'
-
-      - string:
-          name: kafkaVer
-          default: '{kafka-version}'
-          description: 'ONOS Kafka App Version to Test Upgrade'
-
-      - string:
-          name: kafkaOarUrl
-          default: '{kafka-oar-url}'
-          description: 'ONOS Kafka App OAR File Url'
-
-      - string:
-          name: adapterOpenOltImage
-          default: '{adapter-open-olt-image}'
-          description: 'Voltha Adapter Open OLT Component Image'
-
-      - string:
-          name: adapterOpenOnuImage
-          default: '{adapter-open-onu-image}'
-          description: 'Voltha Adapter Open ONU Component Image'
-
-      - string:
-          name: rwCoreImage
-          default: '{rw-core-image}'
-          description: 'Voltha RW Core Component Image'
-
-      - string:
-          name: ofAgentImage
-          default: '{ofagent-image}'
-          description: 'Voltha Ofagent Component Image'
-
-      - string:
-          name: onuImageName
-          default: '{onu-image-name}'
-          description: 'Name of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageUrl
-          default: '{onu-image-url}'
-          description: 'Url of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageVersion
-          default: '{onu-image-version}'
-          description: 'Version of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageCrc
-          default: '{onu-image-crc}'
-          description: 'CRC of ONU Image to Upgrade'
-
-      - string:
-          name: onuImageLocalDir
-          default: '{onu-image-local-dir}'
-          description: 'Local Dir of ONU Image to Upgrade'
-
-    project-type: pipeline
-    concurrent: true
-
-    dsl: !include-raw-escape: pipeline/{pipeline-script}
-
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 {time-trigger}
-
-- job-template:
     id: 'software-upgrades-test'
     name: '{name}'
     sandbox: true