clone template *-new for the -voltha-2.11 job
Copy master paramters -vs- 2.8 for software-upgrades-test-voltha-2.11 template.
Remove dup definition:
o voltha-scale-measurements-2.11-10-stacks-2-16-32-tt-subscribers
o voltha-scale-measurements-2.11-10-stacks-2-16-32-dt-subscribers
Change-Id: I4454a1d1f731960df9ad9f5251b16d8f2973335c
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 6cfa900..d8bd148 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -58,10 +58,10 @@
mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.4.0/mcast-app-2.8.0.oar'
kafka-version: '2.11.1'
kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.11.1/kafka-2.11.1.oar'
- adapter-open-olt-image: 'voltha/voltha-openolt-adapter:4.2.12'
- adapter-open-onu-image: 'voltha/voltha-openonu-adapter-go:2.7.3'
- rw-core-image: 'voltha/voltha-rw-core:3.1.8'
- ofagent-image: 'voltha/voltha-ofagent-go:2.1.3'
+ openolt-adapter-deploy-base-tag: '4.2.6'
+ openonu-adapter-deploy-base-tag: '2.2.8'
+ rw-core-deploy-base-tag: '3.1.8'
+ ofagent-deploy-base-tag: '2.1.2'
onu-image-version: 'BBSM_IMG_00002'
onu-image-url: 'http://bbsim0:50074/images/software-image.img'
onu-image-vendor: 'BBSM'
@@ -298,6 +298,203 @@
TZ=America/Los_Angeles
{time-trigger}
+# to be used for voltha releases 2.9 onwards
+- job-template:
+ id: 'software-upgrades-test-voltha-2.11'
+ 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'
+
+ - 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: openoltAdapterDeployBaseTag
+ default: '{openolt-adapter-deploy-base-tag}'
+ description: 'Minimum Version of OpenOLT Adapter to be used for Deployment'
+
+ - string:
+ name: openonuAdapterDeployBaseTag
+ default: '{openonu-adapter-deploy-base-tag}'
+ description: 'Minimum Version of OpenONU Adapter to be used for Deployment'
+
+ - string:
+ name: rwCoreDeployBaseTag
+ default: '{rw-core-deploy-base-tag}'
+ description: 'Minimum Version of RW Core to be used for Deployment'
+
+ - string:
+ name: ofagentDeployBaseTag
+ default: '{ofagent-deploy-base-tag}'
+ description: 'Minimum Version of Ofagent to be used for Deployment'
+
+ - 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}
+
# to be used for voltha release 2.8
- job-template:
id: 'software-upgrades-test-old'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 689faeb..c780c42 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -721,105 +721,6 @@
extraHelmFlags: "--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
# 2.11 multi-stack jobs
- - 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-att-subscribers'
- build-node: 'voltha-scale-2'
- pipeline-script: 'voltha/voltha-2.11/voltha-scale-multi-stack.groovy'
- time-trigger: "H H/4 * * *"
- disable-job: true
- withMonitoring: false
- logLevel: WARN
- onosReplicas: 1
- atomixReplicas: 0
- kafkaReplicas: 1
- etcdReplicas: 1
- volthaStacks: 10
- olts: 2
- pons: 16
- onus: 32
- withFlows: true
- provisionSubscribers: true
- release: voltha-2.11
- karaf-home: 'apache-karaf-4.2.9'
- workflow: att
- withEapol: true
- withDhcp: true
- withIgmp: false
- bbsimImg: ''
- rwCoreImg: ''
- ofAgentImg: ''
- openoltAdapterImg: ''
- openonuAdapterImg: ''
- openonuAdapterGoImg: ''
- onosImg: 'voltha/voltha-onos:5.0.4'
- extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
-
- - 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-dt-subscribers'
- build-node: 'voltha-scale-2'
- pipeline-script: 'voltha/voltha-2.11/voltha-scale-multi-stack.groovy'
- time-trigger: "H H/4 * * *"
- disable-job: true
- withMonitoring: false
- logLevel: WARN
- onosReplicas: 1
- atomixReplicas: 0
- kafkaReplicas: 1
- etcdReplicas: 1
- volthaStacks: 10
- olts: 2
- pons: 16
- onus: 32
- withFlows: true
- provisionSubscribers: true
- release: voltha-2.11
- karaf-home: 'apache-karaf-4.2.9'
- workflow: dt
- withEapol: false
- withDhcp: false
- withIgmp: false
- bbsimImg: ''
- rwCoreImg: ''
- ofAgentImg: ''
- openoltAdapterImg: ''
- openonuAdapterImg: ''
- openonuAdapterGoImg: ''
- onosImg: ''
- extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
-
- - 'voltha-scale-measurements':
- name: 'voltha-scale-measurements-2.11-10-stacks-2-16-32-tt-subscribers'
- build-node: 'voltha-scale-2'
- pipeline-script: 'voltha/voltha-2.11/voltha-scale-multi-stack.groovy'
- time-trigger: "H H/4 * * *"
- disable-job: true
- withMonitoring: false
- logLevel: WARN
- onosReplicas: 1
- atomixReplicas: 0
- kafkaReplicas: 1
- etcdReplicas: 1
- volthaStacks: 10
- olts: 2
- pons: 16
- onus: 32
- withFlows: true
- provisionSubscribers: true
- release: voltha-2.11
- karaf-home: 'apache-karaf-4.2.9'
- workflow: tt
- withEapol: false
- withDhcp: true
- withIgmp: true
- bbsimImg: ''
- rwCoreImg: ''
- ofAgentImg: ''
- openoltAdapterImg: ''
- openonuAdapterImg: ''
- openonuAdapterGoImg: ''
- onosImg: ''
- extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
-
# per patchset job
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-patchset-1-16-32-att-subscribers'