VOL-5176: Purge 2.8 jobs

This also includes moving several jobs back to their original build agent, since build agent issues have been fixed. Signed-off-by: Eric Ball <[email protected]> Change-Id: I2adfc8a65dfa7cacb80a59fc418cb3b00a7e5ffe
opencord · Sep 19, 2024 · 8b48c86 · 8b48c86
1 parent 5f03008
commit 8b48c86
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 1,602 deletions.
diff --git a/jjb/repos/voltha-helm-charts.yaml b/jjb/repos/voltha-helm-charts.yaml
@@ -18,10 +18,6 @@
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-#      - 'verify-voltha-helm-charts-jobs-voltha-2.8':
-#          name-extension: '-voltha-2.8'
-#          override-branch: 'voltha-2.8'
-#          branch-regexp: '^voltha-2.8$'
       - 'verify-voltha-helm-charts-jobs-master':
           branch-regexp: '^master$'
 
@@ -53,10 +49,4 @@
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
 
-# - job-group:
-#    name: 'verify-voltha-helm-charts-jobs-voltha-2.8'
-#    jobs:
-#      - 'voltha-patch-test':
-#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
 # [EOF]
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
@@ -133,37 +133,6 @@
           onu-image-crc: '0'
           time-trigger: "H H/23 * * *"
 
-#      - 'software-upgrades-test-2.8':
-#          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.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.12'
-#          adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:1.3.28'
-#          rw-core-image: 'voltha/voltha-rw-core:2.9.6'
-#          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'
-#          time-trigger: "H H/23 * * *"
-
 # -----------------------------------------------------------------------
 # to be used for voltha releases 2.9 onwards
 # -----------------------------------------------------------------------
@@ -778,209 +747,4 @@
                  TZ=America/Los_Angeles
                  {time-trigger}
 
-# -----------------------------------------------------------------------
-# to be used for voltha release 2.8
-# -----------------------------------------------------------------------
-# - job-template:
-#    id: 'software-upgrades-test-2.8'
-#    name: '{name}'
-#    sandbox: true
-#    volthaSystemTestsChange: ''
-#    volthaHelmChartsChange: ''
-#    kindVolthaChange: ''
-#    logLevel: 'DEBUG'
-#    logging: true
-#
-#    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:
-#      - onf-infra-volthadevs-permissions
-#      - 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: onuImageVersion
-#          default: '{onu-image-version}'
-#          description: 'Version of ONU Image to Upgrade'
-#
-#      - string:
-#          name: onuImageUrl
-#          default: '{onu-image-url}'
-#          description: 'Url of ONU Image to Upgrade'
-#
-#      - string:
-#          name: onuImageVendor
-#          default: '{onu-image-vendor}'
-#          description: 'Vendor of ONU Image to Upgrade'
-#
-#      - string:
-#          name: onuImageActivateOnSuccess
-#          default: '{onu-image-activate-on-success}'
-#          description: 'Activate ONU Image'
-#
-#      - string:
-#          name: onuImageCommitOnSuccess
-#          default: '{onu-image-commit-on-success}'
-#          description: 'Commit ONU Image'
-#
-#      - string:
-#          name: onuImageCrc
-#          default: '{onu-image-crc}'
-#          description: 'CRC of ONU Image to Upgrade'
-#
-#      - string:
-#          name: logLevel
-#          default: '{logLevel}'
-#          description: 'Log level for all the components'
-#
-#      - bool:
-#          name: logging
-#          default: '{logging}'
-#          description: 'Option to collect voltha components logs per test case'
-#
-#    project-type: pipeline
-#    concurrent: true
-#
-#    dsl: !include-raw-escape: pipeline/{pipeline-script}
-#
-#    triggers:
-#      - timed: |
-#                 TZ=America/Los_Angeles
-#                 {time-trigger}
-
 # [EOF]
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
@@ -55,29 +55,6 @@
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
 
-# - job-group:
-#    name: 'verify-bbsim-jobs-voltha-2.8'
-#    jobs:
-#      - 'voltha-patch-test':
-#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-#          testTargets: |
-#            - target: sanity-bbsim-att
-#              workflow: att
-#              flags: ""
-#              teardown: true
-#              logging: true
-#            - target: sanity-bbsim-dt
-#              workflow: dt
-#              flags: ""
-#              teardown: true
-#              logging: true
-#            - target: sanity-bbsim-tt
-#              workflow: tt
-#              flags: ""
-#              teardown: true
-#              logging: true
-#
-
 - job-group:
     name: 'verify-bbsim-jobs-master'
     jobs:

diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
@@ -18,10 +18,6 @@
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '{kind-voltha-regexp}'
-#      - 'verify-ofagent-jobs-voltha-2.8':
-#          name-extension: '-voltha-2.8'
-#          override-branch: 'voltha-2.8'
-#          branch-regexp: '{kind-voltha-regexp}'
       - 'publish-ofagent-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -30,8 +26,7 @@
     jobs:
       - 'verify-licensed'
       - 'make-unit-test':
-          # build-node: 'ubuntu18.04-basebuild-4c-8g'
-          build-node: 'ubuntu18.04-basebuild-8c-15g'
+          build-node: 'ubuntu18.04-basebuild-4c-8g'
           dest-gopath: "github.com/opencord"
           unit-test-targets: 'lint sca test'
           unit-test-keep-going: 'false'
@@ -57,12 +52,6 @@
           pipeline-script: 'voltha/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.12'
 
-# - job-group:
-#    name: 'verify-ofagent-jobs-voltha-2.8'
-#    jobs:
-#      - 'voltha-patch-test':
-#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
 - job-group:
     name: 'publish-ofagent-go-jobs'
     jobs:

diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
@@ -18,10 +18,6 @@
           name-extension: '-voltha-2.11'
           override-branch: 'voltha-2.11'
           branch-regexp: '^voltha-2.11$'
-#      - 'verify-voltha-go-jobs-voltha-2.8':
-#          name-extension: '-voltha-2.8'
-#          override-branch: 'voltha-2.8'
-#          branch-regexp: '^voltha-2.8$'
       - 'publish-voltha-go-jobs':
           branch-regexp: '{all-branches-regexp}'
 
@@ -59,12 +55,6 @@
           pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
           pipeline-branch: 'voltha-2.11'
 
-# - job-group:
-#    name: 'verify-voltha-go-jobs-voltha-2.8'
-#    jobs:
-#      - 'voltha-patch-test':
-#          pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-
 - job-group:
     name: 'verify-voltha-go-jobs-master'
     jobs: