[VOL-5005] - Create v2.12 release branch for test jobs.
[VOL-5013] - Disable voltha 2.8 jenkins jobs.
.wip/periodic-voltha-multiple-olts-pm-data-test-bbsim/TODO
jjb/voltha-e2e.yaml
jjb/voltha-e2e/master.yaml
jjb/voltha-e2e/voltha-2.11.yaml
jjb/voltha-e2e/voltha-2.12.yaml
jjb/voltha-e2e/voltha-2.8.yaml
--------------------------------
o Refactor test periodic-voltha-multiple-olts-pm-data-test-bbsim
o out of voltha-e2e.yaml into versioned release subdirectories.
Change-Id: I78ee8aa852d7d9724af48c539e2a1a90628ad756
diff --git a/.wip/periodic-voltha-multiple-olts-pm-data-test-bbsim/TODO b/.wip/periodic-voltha-multiple-olts-pm-data-test-bbsim/TODO
new file mode 100644
index 0000000..6c9e3c1
--- /dev/null
+++ b/.wip/periodic-voltha-multiple-olts-pm-data-test-bbsim/TODO
@@ -0,0 +1 @@
+Verify *-test-bbsim-2.12 matches the view pattern (voltha)?-2\.\d\d$
\ No newline at end of file
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 4f42bb2..2d6a5b8 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1292,31 +1292,6 @@
logging: true
timeout: 270
- # Migrating to voltha-e2e/master.yaml
-# - 'voltha-periodic-test':
-# name: 'periodic-voltha-pm-data-test-bbsim-master'
-# code-branch: 'master'
-# extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
-# time-trigger: "H H/23 * * *"
-# logLevel: 'DEBUG'
-# testTargets: |
-# - target: voltha-pm-data-single-kind-att
-# workflow: att
-# flags: ""
-# teardown: true
-# logging: true
-# - target: voltha-pm-data-single-kind-dt
-# workflow: dt
-# flags: ""
-# teardown: true
-# logging: true
-# - target: voltha-pm-data-single-kind-tt
-# workflow: tt
-# flags: ""
-# teardown: true
-# logging: true
-# timeout: 140
-
- 'voltha-periodic-test':
name: 'patchset-voltha-pm-data-test-bbsim'
trigger-comment: "voltha test pm data singleolt"
@@ -1343,82 +1318,10 @@
logging: true
timeout: 140
-# - 'voltha-periodic-test':
-# name: 'periodic-voltha-pm-data-test-bbsim-2.8'
-# disable-job: true
-# pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
-# code-branch: 'voltha-2.8'
-# extraHelmFlags: '--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
-# time-trigger: "H H/23 * * *"
-# logLevel: 'DEBUG'
-# testTargets: |
-# - target: voltha-pm-data-single-kind-att
-# workflow: att
-# flags: ""
-# teardown: true
-# logging: true
-# - target: voltha-pm-data-single-kind-dt
-# workflow: dt
-# flags: ""
-# teardown: true
-# logging: true
-# - target: voltha-pm-data-single-kind-tt
-# workflow: tt
-# flags: ""
-# teardown: true
-# logging: true
-# timeout: 140
-
-# - 'voltha-periodic-test':
-# name: 'periodic-voltha-pm-data-test-bbsim-2.11'
-# pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
-# code-branch: 'voltha-2.11'
-# extraHelmFlags: '--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
-# time-trigger: "H H/23 * * *"
-# logLevel: 'DEBUG'
-# testTargets: |
-# - target: voltha-pm-data-single-kind-att
-# workflow: att
-# flags: ""
-# teardown: true
-# logging: true
-# - target: voltha-pm-data-single-kind-dt
-# workflow: dt
-# flags: ""
-# teardown: true
-# logging: true
-# - target: voltha-pm-data-single-kind-tt
-# workflow: tt
-# flags: ""
-# teardown: true
-# logging: true
-# timeout: 140
-
- - 'voltha-periodic-test':
- name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim'
- code-branch: 'master'
- extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
- olts: 2
- timeout: 180
- logLevel: 'DEBUG'
- testTargets: |
- - target: voltha-pm-data-multiolt-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-pm-data-multiolt-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-pm-data-multiolt-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- time-trigger: "H H/23 * * *"
-
+#-----------------------------------------------------------------------
+# Intent: Pipeline jobs refactored into voltha-e2e/votlha-x.1x
+# What to do with patchset-* (?)
+#-----------------------------------------------------------------------
- 'voltha-periodic-test':
name: 'patchset-voltha-multiple-olts-pm-data-test-bbsim'
trigger-comment: "voltha test pm data multiolt"
@@ -1447,58 +1350,6 @@
timeout: 180
- 'voltha-periodic-test':
- name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.8'
- pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
- code-branch: 'voltha-2.8'
- extraHelmFlags: '--set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
- olts: 2
- timeout: 180
- logLevel: 'DEBUG'
- testTargets: |
- - target: voltha-pm-data-multiolt-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-pm-data-multiolt-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-pm-data-multiolt-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- time-trigger: "H H/23 * * *"
-
- - 'voltha-periodic-test':
- name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- code-branch: 'voltha-2.11'
- extraHelmFlags: '--set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
- olts: 2
- timeout: 180
- logLevel: 'DEBUG'
- testTargets: |
- - target: voltha-pm-data-multiolt-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-pm-data-multiolt-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-pm-data-multiolt-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- time-trigger: "H H/23 * * *"
-
- - 'voltha-periodic-test':
name: 'periodic-voltha-test-DMI'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
code-branch: 'master'
diff --git a/jjb/voltha-e2e/master.yaml b/jjb/voltha-e2e/master.yaml
index f1f9aba..7d1407f 100644
--- a/jjb/voltha-e2e/master.yaml
+++ b/jjb/voltha-e2e/master.yaml
@@ -44,3 +44,30 @@
teardown: true
logging: true
timeout: 140
+
+ - 'voltha-periodic-test':
+ name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim'
+ code-branch: 'master'
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+ olts: 2
+ timeout: 180
+ logLevel: 'DEBUG'
+ testTargets: |
+ - target: voltha-pm-data-multiolt-kind-att
+ workflow: att
+ flags: ""
+ teardown: true
+ logging: true
+ - target: voltha-pm-data-multiolt-kind-dt
+ workflow: dt
+ flags: ""
+ teardown: true
+ logging: true
+ - target: voltha-pm-data-multiolt-kind-tt
+ workflow: tt
+ flags: ""
+ teardown: true
+ logging: true
+ time-trigger: "H H/23 * * *"
+
+# [EOF]
diff --git a/jjb/voltha-e2e/voltha-2.11.yaml b/jjb/voltha-e2e/voltha-2.11.yaml
index 18e9710..18ec234 100644
--- a/jjb/voltha-e2e/voltha-2.11.yaml
+++ b/jjb/voltha-e2e/voltha-2.11.yaml
@@ -46,3 +46,31 @@
teardown: true
logging: true
timeout: 140
+
+ - 'voltha-periodic-test':
+ name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.11'
+ pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ code-branch: 'voltha-2.11'
+ extraHelmFlags: '--set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+ olts: 2
+ timeout: 180
+ logLevel: 'DEBUG'
+ testTargets: |
+ - target: voltha-pm-data-multiolt-kind-att
+ workflow: att
+ flags: ""
+ teardown: true
+ logging: true
+ - target: voltha-pm-data-multiolt-kind-dt
+ workflow: dt
+ flags: ""
+ teardown: true
+ logging: true
+ - target: voltha-pm-data-multiolt-kind-tt
+ workflow: tt
+ flags: ""
+ teardown: true
+ logging: true
+ time-trigger: "H H/23 * * *"
+
+# [EOF]
diff --git a/jjb/voltha-e2e/voltha-2.12.yaml b/jjb/voltha-e2e/voltha-2.12.yaml
index 5c419b4..e2721e9 100644
--- a/jjb/voltha-e2e/voltha-2.12.yaml
+++ b/jjb/voltha-e2e/voltha-2.12.yaml
@@ -46,3 +46,31 @@
teardown: true
logging: true
timeout: 140
+
+ - 'voltha-periodic-test':
+ name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.12'
+ pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ code-branch: 'voltha-2.12'
+ extraHelmFlags: '--set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+ olts: 2
+ timeout: 180
+ logLevel: 'DEBUG'
+ testTargets: |
+ - target: voltha-pm-data-multiolt-kind-att
+ workflow: att
+ flags: ""
+ teardown: true
+ logging: true
+ - target: voltha-pm-data-multiolt-kind-dt
+ workflow: dt
+ flags: ""
+ teardown: true
+ logging: true
+ - target: voltha-pm-data-multiolt-kind-tt
+ workflow: tt
+ flags: ""
+ teardown: true
+ logging: true
+ time-trigger: "H H/23 * * *"
+
+# [EOF]
diff --git a/jjb/voltha-e2e/voltha-2.8.yaml b/jjb/voltha-e2e/voltha-2.8.yaml
index dcb1232..9cea368 100644
--- a/jjb/voltha-e2e/voltha-2.8.yaml
+++ b/jjb/voltha-e2e/voltha-2.8.yaml
@@ -48,3 +48,30 @@
logging: true
timeout: 140
+ - 'voltha-periodic-test':
+ name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.8'
+ pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+ code-branch: 'voltha-2.8'
+ extraHelmFlags: '--set onu=2,pon=2 --set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1'
+ olts: 2
+ timeout: 180
+ logLevel: 'DEBUG'
+ testTargets: |
+ - target: voltha-pm-data-multiolt-kind-att
+ workflow: att
+ flags: ""
+ teardown: true
+ logging: true
+ - target: voltha-pm-data-multiolt-kind-dt
+ workflow: dt
+ flags: ""
+ teardown: true
+ logging: true
+ - target: voltha-pm-data-multiolt-kind-tt
+ workflow: tt
+ flags: ""
+ teardown: true
+ logging: true
+ time-trigger: "H H/23 * * *"
+
+# [EOF]
diff --git a/vars/installVoltctl.groovy b/vars/installVoltctl.groovy
index e8b08d4..f5f54af 100644
--- a/vars/installVoltctl.groovy
+++ b/vars/installVoltctl.groovy
@@ -37,6 +37,7 @@
// This logic seems odd given we branch & tag repositories
// for release so hilight non-frozen until we know for sure.
def released=[
+ // 'voltha-2.12' : '?.?.?'
// https://github.com/opencord/voltctl/releases/tag/v1.8.1
// 'voltha-2.11' : '1.8.4',
// https://github.com/opencord/voltctl/releases/tag/v1.7.6