Update for Voltha 2.14 release
Remove all 2.11 and 2.13 tests, add 2.14.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: Ifc261707dd36aa465b2f0cc3dfe69cdc14844da8
diff --git a/.gitreview b/.gitreview
index 74ed635..f6a93d9 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,4 +3,4 @@
port=29418
project=ci-management.git
defaultremote=origin
-defaultbranch=master
+defaultbranch=voltha-2.14
diff --git a/jjb/pipeline/voltha/bbsim-tests.groovy b/jjb/pipeline/voltha/bbsim-tests.groovy
index df4ad02..271de1d 100644
--- a/jjb/pipeline/voltha/bbsim-tests.groovy
+++ b/jjb/pipeline/voltha/bbsim-tests.groovy
@@ -37,7 +37,7 @@
// as a guarantee release jobs are running in an expected sandbox.
// -----------------------------------------------------------------------
String branchName() {
- def validBranches = ["master", "voltha-2.13"]
+ def validBranches = ["master", "voltha-2.14"]
// "${branch}" is assigned by jenkins
if (!validBranches.contains(branch)) {
diff --git a/jjb/repos/voltha-helm-charts.yaml b/jjb/repos/voltha-helm-charts.yaml
index 06aa4ce..b0802cd 100644
--- a/jjb/repos/voltha-helm-charts.yaml
+++ b/jjb/repos/voltha-helm-charts.yaml
@@ -10,14 +10,10 @@
jobs:
- 'verify-voltha-helm-charts-jobs':
branch-regexp: '{all-branches-regexp}'
- - 'verify-voltha-helm-charts-jobs-voltha-2.13':
- name-extension: '-voltha-2.13'
- override-branch: 'voltha-2.13'
- branch-regexp: '^voltha-2.13$'
- - 'verify-voltha-helm-charts-jobs-voltha-2.11':
- name-extension: '-voltha-2.11'
- override-branch: 'voltha-2.11'
- branch-regexp: '^voltha-2.11$'
+ - 'verify-voltha-helm-charts-jobs-voltha-2.14':
+ name-extension: '-voltha-2.14'
+ override-branch: 'voltha-2.14'
+ branch-regexp: '^voltha-2.14$'
- 'verify-voltha-helm-charts-jobs-master':
branch-regexp: '^master$'
@@ -36,17 +32,10 @@
- 'voltha-patch-test'
- job-group:
- name: 'verify-voltha-helm-charts-jobs-voltha-2.13'
+ name: 'verify-voltha-helm-charts-jobs-voltha-2.14'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
-
-- job-group:
- name: 'verify-voltha-helm-charts-jobs-voltha-2.11'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
+ pipeline-branch: 'voltha-2.14'
# [EOF]
diff --git a/jjb/software-upgrades.yaml b/jjb/software-upgrades.yaml
index 1a1c4e2..b8c96c9 100644
--- a/jjb/software-upgrades.yaml
+++ b/jjb/software-upgrades.yaml
@@ -37,23 +37,23 @@
build-node: 'ubuntu18.04-basebuild-8c-15g'
code-branch: 'master'
aaa-version: '2.11.2'
- aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.10.3/aaa-app-2.10.3.oar'
+ aaa-oar-url: 'https://repo1.maven.org/maven2/org/opencord/aaa-app/2.11.2/aaa-app-2.11.2.oar'
olt-version: '5.2.8'
- olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.2.4/olt-app-5.2.4.oar'
+ olt-oar-url: 'https://repo1.maven.org/maven2/org/opencord/olt-app/5.2.8/olt-app-5.2.8.oar'
dhcpl2relay-version: '2.11.2'
- dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.10.0/dhcpl2relay-app-2.10.0.oar'
+ dhcpl2relay-oar-url: 'https://repo1.maven.org/maven2/org/opencord/dhcpl2relay-app/2.11.2/dhcpl2relay-app-2.11.2.oar'
igmpproxy-version: '2.9.1'
- igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.8.0/onos-app-igmpproxy-app-2.8.0.oar'
+ igmpproxy-oar-url: 'https://repo1.maven.org/maven2/org/opencord/onos-app-igmpproxy-app/2.9.1/onos-app-igmpproxy-app-2.9.1.oar'
sadis-version: '5.12.3'
- sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.11.1/sadis-app-5.11.1.oar'
+ sadis-oar-url: 'https://repo1.maven.org/maven2/org/opencord/sadis-app/5.12.3/sadis-app-5.12.3.oar'
mcast-version: '2.9.3'
- mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.9.0/mcast-app-2.9.0.oar'
- kafka-version: '2.13.3'
- kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.12.0/kafka-2.12.0.oar'
+ mcast-oar-url: 'https://repo1.maven.org/maven2/org/opencord/mcast-app/2.9.3/mcast-app-2.9.3.oar'
+ kafka-version: '2.13.2'
+ kafka-oar-url: 'https://repo1.maven.org/maven2/org/opencord/kafka/2.13.2/kafka-2.13.2.oar'
openolt-adapter-deploy-base-tag: '4.5.6'
- openonu-adapter-deploy-base-tag: '2.12.14'
+ openonu-adapter-deploy-base-tag: '2.12.25'
rw-core-deploy-base-tag: '3.6.6'
- ofagent-deploy-base-tag: '2.13.0'
+ ofagent-deploy-base-tag: '2.3.2'
onu-image-version: 'BBSM_IMG_00002'
onu-image-url: 'http://bbsim0:50074/images/software-image.img'
onu-image-vendor: 'BBSM'
@@ -63,33 +63,33 @@
time-trigger: "H H/23 * * *"
# -----------------------------------------------------------------------
-# voltha 2.13 release
+# voltha 2.14 release
# -----------------------------------------------------------------------
- 'software-upgrades-test':
- name: 'periodic-software-upgrade-test-bbsim-2.13'
- pipeline-script: 'voltha/voltha-2.13/software-upgrades.groovy'
- pipeline-branch: 'voltha-2.13'
+ name: 'periodic-software-upgrade-test-bbsim-2.14'
+ pipeline-script: 'voltha/voltha-2.14/software-upgrades.groovy'
+ pipeline-branch: 'voltha-2.14'
build-node: 'ubuntu18.04-basebuild-8c-15g'
- code-branch: 'voltha-2.13'
+ code-branch: 'voltha-2.14'
aaa-version: '2.11.2'
- aaa-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/aaa-app/2.10.3/aaa-app-2.10.3.oar'
+ aaa-oar-url: 'https://repo1.maven.org/maven2/org/opencord/aaa-app/2.11.2/aaa-app-2.11.2.oar'
olt-version: '5.2.8'
- olt-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/olt-app/5.2.4/olt-app-5.2.4.oar'
+ olt-oar-url: 'https://repo1.maven.org/maven2/org/opencord/olt-app/5.2.8/olt-app-5.2.8.oar'
dhcpl2relay-version: '2.11.2'
- dhcpl2relay-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/dhcpl2relay-app/2.10.0/dhcpl2relay-app-2.10.0.oar'
+ dhcpl2relay-oar-url: 'https://repo1.maven.org/maven2/org/opencord/dhcpl2relay-app/2.11.2/dhcpl2relay-app-2.11.2.oar'
igmpproxy-version: '2.9.1'
- igmpproxy-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/onos-app-igmpproxy-app/2.8.0/onos-app-igmpproxy-app-2.8.0.oar'
+ igmpproxy-oar-url: 'https://repo1.maven.org/maven2/org/opencord/onos-app-igmpproxy-app/2.9.1/onos-app-igmpproxy-app-2.9.1.oar'
sadis-version: '5.12.3'
- sadis-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/sadis-app/5.11.1/sadis-app-5.11.1.oar'
+ sadis-oar-url: 'https://repo1.maven.org/maven2/org/opencord/sadis-app/5.12.3/sadis-app-5.12.3.oar'
mcast-version: '2.9.3'
- mcast-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/mcast-app/2.9.0/mcast-app-2.9.0.oar'
- kafka-version: '2.13.3'
- kafka-oar-url: 'https://oss.sonatype.org/content/groups/public/org/opencord/kafka/2.12.0/kafka-2.12.0.oar'
+ mcast-oar-url: 'https://repo1.maven.org/maven2/org/opencord/mcast-app/2.9.3/mcast-app-2.9.3.oar'
+ kafka-version: '2.13.2'
+ kafka-oar-url: 'https://repo1.maven.org/maven2/org/opencord/kafka/2.13.2/kafka-2.13.2.oar'
openolt-adapter-deploy-base-tag: '4.5.6'
- openonu-adapter-deploy-base-tag: '2.12.14'
+ openonu-adapter-deploy-base-tag: '2.12.25'
rw-core-deploy-base-tag: '3.6.6'
- ofagent-deploy-base-tag: '2.13.0'
+ ofagent-deploy-base-tag: '2.3.2'
onu-image-version: 'BBSM_IMG_00002'
onu-image-url: 'http://bbsim0:50074/images/software-image.img'
onu-image-vendor: 'BBSM'
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index 353f01a..72649db 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -30,12 +30,9 @@
jobs:
- 'verify-bbsim-sadis-server-jobs':
branch-regexp: '{all-branches-regexp}'
- - 'verify-bbsim-sadis-server-jobs-voltha-2.13':
- name-extension: '-voltha-2.13'
- branch-regexp: '^voltha-2.13$'
- - 'verify-bbsim-sadis-server-jobs-voltha-2.11':
- name-extension: '-voltha-2.11'
- branch-regexp: '^voltha-2.11$'
+ - 'verify-bbsim-sadis-server-jobs-voltha-2.14':
+ name-extension: '-voltha-2.14'
+ branch-regexp: '^voltha-2.14$'
- 'verify-bbsim-sadis-server-jobs-master':
branch-regexp: '^master$'
- 'publish-bbsim-sadis-server-jobs':
@@ -60,18 +57,11 @@
--set onos-classic.image.tag=master
- job-group:
- name: 'verify-bbsim-sadis-server-jobs-voltha-2.13'
+ name: 'verify-bbsim-sadis-server-jobs-voltha-2.14'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
-
-- job-group:
- name: 'verify-bbsim-sadis-server-jobs-voltha-2.11'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
+ pipeline-branch: 'voltha-2.14'
- job-group:
name: 'publish-bbsim-sadis-server-jobs'
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 27f8d35..08b0d2a 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -31,14 +31,10 @@
jobs:
- 'verify-bbsim-jobs':
branch-regexp: '{all-branches-regexp}'
- - 'verify-bbsim-jobs-voltha-2.13':
- name-extension: '-voltha-2.13'
- override-branch: 'voltha-2.13'
- branch-regexp: '^voltha-2.13$'
- - 'verify-bbsim-jobs-voltha-2.11':
- name-extension: '-voltha-2.11'
- override-branch: 'voltha-2.11'
- branch-regexp: '^voltha-2.11$'
+ - 'verify-bbsim-jobs-voltha-2.14':
+ name-extension: '-voltha-2.14'
+ override-branch: 'voltha-2.14'
+ branch-regexp: '^voltha-2.14$'
- 'verify-bbsim-jobs-master':
branch-regexp: '^master$'
- 'publish-bbsim-jobs':
@@ -78,11 +74,11 @@
logging: true
- job-group:
- name: 'verify-bbsim-jobs-voltha-2.13'
+ name: 'verify-bbsim-jobs-voltha-2.14'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
+ pipeline-branch: 'voltha-2.14'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
testTargets: |
- target: sanity-bbsim-dt
@@ -97,30 +93,6 @@
logging: true
- job-group:
- name: 'verify-bbsim-jobs-voltha-2.11'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
- 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: 'publish-bbsim-jobs'
jobs:
- 'docker-publish':
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 1021367..f4f3338 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -10,13 +10,10 @@
branch-regexp: '{all-branches-regexp}'
- 'verify-ofagent-jobs-master':
branch-regexp: '^master$'
- - 'verify-ofagent-jobs-voltha-2.13':
- name-extension: '-voltha-2.13'
- override-branch: 'voltha-2.13'
+ - 'verify-ofagent-jobs-voltha-2.14':
+ name-extension: '-voltha-2.14'
+ override-branch: 'voltha-2.14'
branch-regexp: '{kind-voltha-regexp}'
- - 'verify-ofagent-jobs-voltha-2.11':
- name-extension: '-voltha-2.11'
- override-branch: 'voltha-2.11'
branch-regexp: '{kind-voltha-regexp}'
- 'publish-ofagent-go-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -39,18 +36,11 @@
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
- job-group:
- name: 'verify-ofagent-jobs-voltha-2.11'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
-
-- job-group:
- name: 'verify-ofagent-jobs-voltha-2.13'
+ name: 'verify-ofagent-jobs-voltha-2.14'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
+ pipeline-branch: 'voltha-2.14'
- job-group:
name: 'verify-ofagent-jobs-voltha-2.12'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 6360dbd..36f7b81 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -10,14 +10,10 @@
branch-regexp: '{all-branches-regexp}'
- 'verify-voltha-go-jobs-master':
branch-regexp: '^master$'
- - 'verify-voltha-go-jobs-voltha-2.13':
- name-extension: '-voltha-2.13'
- override-branch: 'voltha-2.13'
- branch-regexp: '^voltha-2.13$'
- - 'verify-voltha-go-jobs-voltha-2.11':
- name-extension: '-voltha-2.11'
- override-branch: 'voltha-2.11'
- branch-regexp: '^voltha-2.11$'
+ - 'verify-voltha-go-jobs-voltha-2.14':
+ name-extension: '-voltha-2.14'
+ override-branch: 'voltha-2.14'
+ branch-regexp: '^voltha-2.14$'
- 'publish-voltha-go-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -42,18 +38,11 @@
unit-test-keep-going: 'false'
- job-group:
- name: 'verify-voltha-go-jobs-voltha-2.13'
+ name: 'verify-voltha-go-jobs-voltha-2.14'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
-
-- job-group:
- name: 'verify-voltha-go-jobs-voltha-2.11'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
+ pipeline-branch: 'voltha-2.14'
- job-group:
name: 'verify-voltha-go-jobs-master'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index b7124b4..c4fabd6 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -10,14 +10,10 @@
branch-regexp: '{all-branches-regexp}'
- 'verify-voltha-onos-jobs-master':
branch-regexp: '^master$'
- - 'verify-voltha-onos-jobs-voltha-2.13':
- name-extension: '-voltha-2.13'
- override-branch: 'voltha-2.13'
- branch-regexp: '^voltha-2.13$'
- - 'verify-voltha-onos-jobs-voltha-2.11':
- name-extension: '-voltha-2.11'
- override-branch: 'voltha-2.11'
- branch-regexp: '^voltha-2.11$'
+ - 'verify-voltha-onos-jobs-voltha-2.14':
+ name-extension: '-voltha-2.14'
+ override-branch: 'voltha-2.14'
+ branch-regexp: '^voltha-2.14$'
- 'publish-voltha-onos-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -27,18 +23,11 @@
- 'verify-licensed'
- job-group:
- name: 'verify-voltha-onos-jobs-voltha-2.13'
+ name: 'verify-voltha-onos-jobs-voltha-2.14'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
-
-- job-group:
- name: 'verify-voltha-onos-jobs-voltha-2.11'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
+ pipeline-branch: 'voltha-2.14'
- job-group:
name: 'verify-voltha-onos-jobs-master'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 6e43577..e069beb 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -10,10 +10,10 @@
branch-regexp: '{all-branches-regexp}'
- 'verify-voltha-openolt-adapter-jobs-master':
branch-regexp: '^master$'
- - 'verify-voltha-openolt-adapter-jobs-voltha-2.13':
- name-extension: '-voltha-2.13'
- override-branch: 'voltha-2.13'
- branch-regexp: '^voltha-2.13$'
+ - 'verify-voltha-openolt-adapter-jobs-voltha-2.14':
+ name-extension: '-voltha-2.14'
+ override-branch: 'voltha-2.14'
+ branch-regexp: '^voltha-2.14$'
- 'publish-voltha-openolt-adapter-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -44,7 +44,7 @@
--set global.image_tag=master --set onos-classic.image.tag=master
- job-group:
- name: 'verify-voltha-openolt-adapter-jobs-voltha-2.13'
+ name: 'verify-voltha-openolt-adapter-jobs-voltha-2.14'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/bbsim-tests.groovy'
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 83b96f9..728788a 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -10,14 +10,10 @@
branch-regexp: '{all-branches-regexp}'
- 'verify-voltha-openonu-adapter-go-jobs-master':
branch-regexp: '^master$'
- - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.13':
- name-extension: '-voltha-2.13'
- override-branch: 'voltha-2.13'
- branch-regexp: '^voltha-2.13$'
- - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11':
- name-extension: '-voltha-2.11'
- override-branch: 'voltha-2.11'
- branch-regexp: '^voltha-2.11$'
+ - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.14':
+ name-extension: '-voltha-2.14'
+ override-branch: 'voltha-2.14'
+ branch-regexp: '^voltha-2.14$'
- 'publish-voltha-openonu-adapter-go-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -41,18 +37,11 @@
build-node: 'ubuntu18.04-basebuild-2c-4g'
- job-group:
- name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.13'
+ name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.14'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
-
-- job-group:
- name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
+ pipeline-branch: 'voltha-2.14'
- job-group:
name: 'verify-voltha-openonu-adapter-go-jobs-master'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 4a1e44e..6aea1dc 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -17,16 +17,11 @@
name-extension: '-py312'
override-branch: 'python312-update'
branch-regexp: '^python312-update$'
- - 'verify-voltha-system-tests-jobs-voltha-2.13':
+ - 'verify-voltha-system-tests-jobs-voltha-2.14':
build-node: 'ubuntu22.04-basebuild-4c-8g'
- name-extension: '-voltha-2.13'
- override-branch: 'voltha-2.13'
- branch-regexp: '^voltha-2.13$'
- - 'verify-voltha-system-tests-jobs-voltha-2.11':
- build-node: 'ubuntu22.04-basebuild-4c-8g'
- name-extension: '-voltha-2.11'
- override-branch: 'voltha-2.11'
- branch-regexp: '^voltha-2.11$'
+ name-extension: '-voltha-2.14'
+ override-branch: 'voltha-2.14'
+ branch-regexp: '^voltha-2.14$'
- job-group:
name: 'verify-voltha-system-tests-jobs'
@@ -45,18 +40,11 @@
pipeline-branch: 'python312-update'
- job-group:
- name: 'verify-voltha-system-tests-jobs-voltha-2.13'
+ name: 'verify-voltha-system-tests-jobs-voltha-2.14'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
-
-- job-group:
- name: 'verify-voltha-system-tests-jobs-voltha-2.11'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
+ pipeline-branch: 'voltha-2.14'
- job-group:
name: 'verify-voltha-system-tests-jobs-master'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index bbccdc9..1ac917c 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -1,7 +1,7 @@
---
# -----------------------------------------------------------------------
-# Copyright 2017-2024 Open Networking Foundation Contributors
+# Copyright 2017-2025 Open Networking Foundation Contributors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# -----------------------------------------------------------------------
-# SPDX-FileCopyrightText: 2017-2024 Open Networking Foundation Contributors
+# SPDX-FileCopyrightText: 2017-2025 Open Networking Foundation Contributors
# SPDX-License-Identifier: Apache-2.0
# -----------------------------------------------------------------------
# Entropy: 0fcb5ffa-d1a4-11ee-be5e-9f44b7181764
@@ -23,11 +23,11 @@
# Intent: voltha 2.0 tests, end-2-end pipeline jobs.
# -----------------------------------------------------------------------
-- _voltha_213_common: &voltha_213_common
- name: voltha-2.13-common
+- _voltha_214_common: &voltha_214_common
+ name: voltha-2.14-common
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
- code-branch: 'voltha-2.13'
+ pipeline-branch: 'voltha-2.14'
+ code-branch: 'voltha-2.14'
time-trigger: "H H/23 * * *"
- project:
@@ -52,12 +52,12 @@
jobs:
# -----------------------------------------------------------------------
- # voltha-2.13 Jobs
+ # voltha-2.14 Jobs
# -----------------------------------------------------------------------
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'periodic-voltha-multiple-olts-test-bbsim-2.13'
+ <<: *voltha_214_common
+ name: 'periodic-voltha-multiple-olts-test-bbsim-2.14'
olts: 2
extraHelmFlags: '--set onu=2,pon=2'
testTargets: |
@@ -83,8 +83,8 @@
logging: true
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'periodic-voltha-multi-uni-test-bbsim-2.13'
+ <<: *voltha_214_common
+ name: 'periodic-voltha-multi-uni-test-bbsim-2.14'
extraHelmFlags: '--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
testTargets: |
- target: functional-single-kind-multiuni-att
@@ -104,8 +104,8 @@
logging: true
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.13'
+ <<: *voltha_214_common
+ name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.14'
olts: 2
extraHelmFlags: '--set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
testTargets: |
@@ -127,8 +127,8 @@
timeout: 180
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'periodic-voltha-openonu-go-test-bbsim-2.13'
+ <<: *voltha_214_common
+ name: 'periodic-voltha-openonu-go-test-bbsim-2.14'
logLevel: 'DEBUG'
testTargets: |
- target: 1t1gem-openonu-go-adapter-test
@@ -234,9 +234,9 @@
timeout: 240
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'patchset-voltha-2.13-openonu-go-test-bbsim'
- trigger-comment: "voltha 2.13 test openonu singleolt"
+ <<: *voltha_214_common
+ name: 'patchset-voltha-2.14-openonu-go-test-bbsim'
+ trigger-comment: "voltha 2.14 test openonu singleolt"
logLevel: 'DEBUG'
testTargets: |
- target: 1t1gem-openonu-go-adapter-test
@@ -332,8 +332,8 @@
timeout: 210
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.13'
+ <<: *voltha_214_common
+ name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.14'
extraHelmFlags: '--set onu=2,pon=2'
olts: 2
logLevel: 'DEBUG'
@@ -402,9 +402,9 @@
timeout: 270
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'patchset-voltha-2.13-multiple-olts-openonu-go-test-bbsim'
- trigger-comment: "voltha 2.13 test openonu multiolt"
+ <<: *voltha_214_common
+ name: 'patchset-voltha-2.14-multiple-olts-openonu-go-test-bbsim'
+ trigger-comment: "voltha 2.14 test openonu multiolt"
extraHelmFlags: '--set onu=2,pon=2'
olts: 2
logLevel: 'DEBUG'
@@ -472,8 +472,8 @@
timeout: 270
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'periodic-voltha-test-DMI-2.13'
+ <<: *voltha_214_common
+ name: 'periodic-voltha-test-DMI-2.14'
testTargets: |
- target: bbsim-dmi-hw-management-test
workflow: att
@@ -482,8 +482,8 @@
logging: true
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'periodic-voltha-etcd-test-2.13'
+ <<: *voltha_214_common
+ name: 'periodic-voltha-etcd-test-2.14'
build-node: 'ubuntu18.04-basebuild-4c-8g'
extraHelmFlags: '--set onu=2,pon=2'
testTargets: |
@@ -494,8 +494,8 @@
logging: true
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim-2.13'
+ <<: *voltha_214_common
+ name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim-2.14'
extraHelmFlags: '--set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
logLevel: 'DEBUG'
robot-args: '-v unitag_sub:True'
@@ -517,8 +517,8 @@
logging: true
- 'voltha-periodic-test':
- <<: *voltha_213_common
- name: 'periodic-voltha-memory-leak-test-bbsim-2.13'
+ <<: *voltha_214_common
+ name: 'periodic-voltha-memory-leak-test-bbsim-2.14'
build-node: 'ubuntu18.04-basebuild-4c-8g'
withMonitoring: true
logLevel: 'DEBUG'
@@ -560,36 +560,6 @@
teardown: false
logging: true
- - 'voltha-periodic-test':
- name: 'periodic-voltha-multiple-olts-test-bbsim-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'voltha-2.11'
- olts: 2
- extraHelmFlags: '--set onu=2,pon=2'
- time-trigger: "H H/23 * * *"
- testTargets: |
- - target: functional-multi-olt
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: bbsim-multiolt-failurescenarios
- workflow: att
- flags: ""
- teardown: false
- logging: true
- - target: bbsim-multiolt-errorscenarios
- workflow: att
- flags: ""
- teardown: false
- logging: true
- - target: bbsim-multiolt-kind
- workflow: att
- flags: ""
- teardown: false
- logging: true
-
# -----------------------------------------------------------------------
# -----------------------------------------------------------------------
- 'voltha-periodic-test':
@@ -638,56 +608,6 @@
logging: true
timeout: 360
- - 'voltha-periodic-test':
- name: 'periodic-voltha-multi-uni-test-bbsim-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'voltha-2.11'
- extraHelmFlags: '--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
- time-trigger: "H H/23 * * *"
- testTargets: |
- - target: functional-single-kind-multiuni-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: bbsim-multiuni-failurescenarios-att
- workflow: att
- flags: ""
- teardown: false
- logging: true
- - target: bbsim-multiuni-errorscenarios-att
- workflow: att
- flags: ""
- teardown: false
- logging: true
-
- - 'voltha-periodic-test':
- name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'voltha-2.11'
- olts: 2
- extraHelmFlags: '--set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
- time-trigger: "H H/23 * * *"
- testTargets: |
- - target: functional-multiuni-multiolt-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: bbsim-multiuni-multiolt-failurescenarios-att
- workflow: att
- flags: ""
- teardown: false
- logging: true
- - target: bbsim-multiuni-multiolt-errorscenarios-att
- workflow: att
- flags: ""
- teardown: false
- logging: true
- timeout: 180
-
# -----------------------------------------------------------------------
# openonu Go periodic tests
# -----------------------------------------------------------------------
@@ -800,116 +720,6 @@
logging: true
timeout: 240
- - 'voltha-periodic-test':
- name: 'periodic-voltha-openonu-go-test-bbsim-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'voltha-2.11'
- time-trigger: "H H/23 * * *"
- logLevel: 'DEBUG'
- testTargets: |
- - target: 1t1gem-openonu-go-adapter-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: 1t4gem-openonu-go-adapter-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: 1t8gem-openonu-go-adapter-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: mib-upload-templating-openonu-go-adapter-test
- workflow: att
- flags: "--set pon=2,onu=2,controlledActivation=only-onu,injectOmciUnknownAttributes=true,injectOmciUnknownMe=true --set global.extended_omci_support.enabled=true "
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-test-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-test-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-multi-uni-test-tt
- workflow: tt
- flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
- teardown: true
- logging: true
- - target: openonu-go-adapter-omci-hardening-passed-test
- workflow: att
- flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
- teardown: true
- logging: true
- - target: openonu-go-adapter-omci-hardening-failed-test
- workflow: att
- flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-single-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-single-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-single-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-single-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-single-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-single-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- - target: onu-mib-audit-test-single-kind-att
- workflow: att
- flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
- teardown: true
- logging: true
- - target: onu-mib-audit-test-single-kind-dt
- workflow: dt
- flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
- teardown: true
- logging: true
- - target: onu-mib-audit-test-single-kind-tt
- workflow: tt
- flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
- teardown: true
- logging: true
- - target: onu-robustness-test-single-kind-dt
- workflow: dt
- flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1"
- teardown: true
- logging: true
- - target: onu-robustness-test-multi-uni-kind-tt
- workflow: tt
- flags: "--set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF,kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1"
- teardown: true
- logging: true
- timeout: 240
-
# -----------------------------------------------------------------------
# -----------------------------------------------------------------------
- 'voltha-periodic-test':
@@ -1013,108 +823,6 @@
logging: true
timeout: 210
- - 'voltha-periodic-test':
- name: 'patchset-voltha-2.11-openonu-go-test-bbsim'
- trigger-comment: "voltha 2.11 test openonu singleolt"
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: '$GERRIT_BRANCH'
- gerritProject: '$GERRIT_PROJECT'
- gerritRefspec: '$GERRIT_REFSPEC'
- logLevel: 'DEBUG'
- testTargets: |
- - target: 1t1gem-openonu-go-adapter-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: 1t4gem-openonu-go-adapter-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: 1t8gem-openonu-go-adapter-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: mib-upload-templating-openonu-go-adapter-test
- workflow: att
- flags: "--set pon=2,onu=2,controlledActivation=only-onu,injectOmciUnknownAttributes=true,injectOmciUnknownMe=true --set global.extended_omci_support.enabled=true "
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-test-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-test-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-multi-uni-test-tt
- workflow: tt
- flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
- teardown: true
- logging: true
- - target: openonu-go-adapter-omci-hardening-passed-test
- workflow: att
- flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
- teardown: true
- logging: true
- - target: openonu-go-adapter-omci-hardening-failed-test
- workflow: att
- flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,omci_response_rate=7"
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-single-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-single-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-single-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-single-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-single-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-single-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- - target: onu-mib-audit-test-single-kind-att
- workflow: att
- flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
- teardown: true
- logging: true
- - target: onu-mib-audit-test-single-kind-dt
- workflow: dt
- flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
- teardown: true
- logging: true
- - target: onu-mib-audit-test-single-kind-tt
- workflow: tt
- flags: "--set kafka.externalAccess.enabled=true,kafka.externalAccess.service.type=NodePort,kafka.externalAccess.service.nodePorts[0]=30201,kafka.externalAccess.service.domain=127.0.0.1,voltha-adapter-openonu.global.mib_audit.interval=60s"
- teardown: true
- logging: true
- timeout: 210
-
# -----------------------------------------------------------------------
# -----------------------------------------------------------------------
- 'voltha-periodic-test':
@@ -1187,78 +895,6 @@
time-trigger: "H H/12 * * *"
timeout: 270
- - 'voltha-periodic-test':
- name: 'periodic-voltha-multiple-olts-openonu-go-test-bbsim-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'voltha-2.11'
- extraHelmFlags: '--set onu=2,pon=2'
- olts: 2
- logLevel: 'DEBUG'
- testTargets: |
- - target: 1t1gem-openonu-go-adapter-multi-olt-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: 1t4gem-openonu-go-adapter-multi-olt-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: 1t8gem-openonu-go-adapter-multi-olt-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-multi-olt-test-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-multi-olt-test-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-multi-olt-multi-uni-test-tt
- workflow: tt
- flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-multiolt-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-multiolt-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-multiolt-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-multiolt-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-multiolt-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-multiolt-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- time-trigger: "H H/23 * * *"
- timeout: 270
-
# -----------------------------------------------------------------------
# -----------------------------------------------------------------------
- 'voltha-periodic-test':
@@ -1333,80 +969,6 @@
olts: 2
timeout: 270
- - 'voltha-periodic-test':
- name: 'patchset-voltha-2.11-multiple-olts-openonu-go-test-bbsim'
- trigger-comment: "voltha 2.11 test openonu multiolt"
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: '$GERRIT_BRANCH'
- gerritProject: '$GERRIT_PROJECT'
- gerritRefspec: '$GERRIT_REFSPEC'
- extraHelmFlags: '--set onu=2,pon=2'
- olts: 2
- logLevel: 'DEBUG'
- testTargets: |
- - target: 1t1gem-openonu-go-adapter-multi-olt-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: 1t4gem-openonu-go-adapter-multi-olt-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: 1t8gem-openonu-go-adapter-multi-olt-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-multi-olt-test-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-multi-olt-test-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: reconcile-openonu-go-adapter-multi-olt-multi-uni-test-tt
- workflow: tt
- flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-multiolt-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-multiolt-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-omci-get-multiolt-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-multiolt-kind-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-multiolt-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: voltha-onu-flows-check-multiolt-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- timeout: 270
-
# -----------------------------------------------------------------------
# -----------------------------------------------------------------------
- 'voltha-periodic-test':
@@ -1480,19 +1042,6 @@
teardown: true
logging: true
- - 'voltha-periodic-test':
- name: 'periodic-voltha-test-DMI-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'voltha-2.11'
- time-trigger: "H H/23 * * *"
- testTargets: |
- - target: bbsim-dmi-hw-management-test
- workflow: att
- flags: ""
- teardown: true
- logging: true
-
# -----------------------------------------------------------------------
# -----------------------------------------------------------------------
- 'voltha-periodic-test':
@@ -1508,21 +1057,6 @@
teardown: true
logging: true
- - 'voltha-periodic-test':
- name: 'periodic-voltha-etcd-test-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- build-node: 'ubuntu18.04-basebuild-4c-8g'
- code-branch: 'voltha-2.11'
- extraHelmFlags: '--set onu=2,pon=2'
- time-trigger: "H H/23 * * *"
- testTargets: |
- - target: sanity-multi-kind
- workflow: att
- flags: ""
- teardown: true
- logging: true
-
# -----------------------------------------------------------------------
# -----------------------------------------------------------------------
- 'voltha-periodic-test':
@@ -1549,32 +1083,6 @@
teardown: true
logging: true
- - 'voltha-periodic-test':
- name: 'periodic-voltha-unitag-subscriber-tt-test-bbsim-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'voltha-2.11'
- extraHelmFlags: '--set onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
- time-trigger: "H H/23 * * *"
- logLevel: 'DEBUG'
- robot-args: '-v unitag_sub:True'
- testTargets: |
- - target: functional-single-kind-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- - target: bbsim-failurescenarios-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
- - target: functional-single-kind-multiuni-tt
- workflow: tt
- flags: " --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF "
- teardown: true
- logging: true
-
# -----------------------------------------------------------------------
# -----------------------------------------------------------------------
- 'voltha-periodic-test':
@@ -1609,23 +1117,6 @@
timeout: 230
- 'voltha-periodic-test':
- name: 'periodic-voltha-memory-leak-test-bbsim-2.11'
- build-node: 'ubuntu18.04-basebuild-4c-8g'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'voltha-2.11'
- time-trigger: "H H/23 * * *"
- withMonitoring: true
- logLevel: 'DEBUG'
- testTargets: |
- - target: memory-leak-test-single-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- timeout: 230
-
- - 'voltha-periodic-test':
name: 'periodic-voltha-tim-multiple-olts-test-bbsim'
code-branch: 'master'
olts: 2
diff --git a/jjb/voltha-e2e/voltha-2.11.yaml b/jjb/voltha-e2e/voltha-2.11.yaml
deleted file mode 100644
index 3faa86b..0000000
--- a/jjb/voltha-e2e/voltha-2.11.yaml
+++ /dev/null
@@ -1,167 +0,0 @@
----
-# voltha 2.x tests
-# [NOTE]
-# o md5sum(master) can be used to locate branch/release variants of a job.
-
-- project:
- name: voltha-e2e-2.11
-
- project-name: '{name}'
- manualBranch: ''
- olts: 1
- onus: 1
- pons: 1
- withAlarms: true
- make-target-failtest: bbsim-failurescenarios
- make-target-errortest: bbsim-errorscenarios
- make-target-alarmtest: bbsim-alarms-kind
- make-target-multipleolt: bbsim-multiolt-kind
- make-target-1t4gemtest: 1t4gem-openonu-go-adapter-test
- make-target-1t8gemtest: 1t8gem-openonu-go-adapter-test
- make-target-reconciletest: reconcile-openonu-go-adapter-test-att
- make-target-reconciledttest: reconcile-openonu-go-adapter-test-dt
- make-target-reconciletttest: reconcile-openonu-go-adapter-test-tt
-
-# source: voltha-e2e.yaml
- jobs:
- - 'voltha-periodic-test':
- name: 'periodic-voltha-pm-data-test-bbsim-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- 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-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- 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-bbsim-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'voltha-2.11'
- logLevel: 'DEBUG' # Force job to regenerate
- time-trigger: "H H/23 * * *"
- testTargets: |
- - target: functional-single-kind
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: bbsim-alarms-kind
- workflow: att
- flags: ""
- teardown: false
- logging: true
- - target: bbsim-failurescenarios
- workflow: att
- flags: ""
- teardown: false
- logging: true
- - target: bbsim-errorscenarios
- workflow: att
- flags: ""
- teardown: false
- logging: true
-
- - 'voltha-periodic-test':
- name: 'periodic-voltha-sanity-test-multi-runs-2.11'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'voltha-2.11'
- time-trigger: "H H/23 * * *"
- testTargets: |
- - target: sanity-kind
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: sanity-kind
- workflow: att
- flags: ""
- teardown: false
- logging: true
- - target: sanity-kind
- workflow: att
- flags: ""
- teardown: false
- logging: true
- - target: sanity-kind
- workflow: att
- flags: ""
- teardown: false
- logging: true
- - target: sanity-kind
- workflow: att
- flags: ""
- teardown: false
- logging: true
-
- # -----------------------------------------------------------------------
- # md5sum(master): eff05a324e94fdef076b2d5f7cb4f80f
- # - pipeline-script was not defined here but was for branch=master test
- # -----------------------------------------------------------------------
- - 'voltha-periodic-test':
- name: 'periodic-voltha-dt-test-bbsim-2.11'
- # build-node: 'ubuntu18.04-basebuild-4c-8g'
- build-node: 'ubuntu18.04-basebuild-8c-15g'
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.11'
- code-branch: 'master'
- time-trigger: "@daily"
- extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master '
- testTargets: |
- - target: functional-single-kind-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: bbsim-failurescenarios-dt
- workflow: dt
- flags: ""
- teardown: false
- logging: true
-
-# [EOF]
diff --git a/jjb/voltha-e2e/voltha-2.13.yaml b/jjb/voltha-e2e/voltha-2.14.yaml
similarity index 88%
rename from jjb/voltha-e2e/voltha-2.13.yaml
rename to jjb/voltha-e2e/voltha-2.14.yaml
index 42de96d..fbf0c24 100644
--- a/jjb/voltha-e2e/voltha-2.13.yaml
+++ b/jjb/voltha-e2e/voltha-2.14.yaml
@@ -4,7 +4,7 @@
# o md5sum(master) can be used to locate branch/release variants of a job.
- project:
- name: voltha-e2e-2.13
+ name: voltha-e2e-2.14
project-name: '{name}'
manualBranch: ''
@@ -24,10 +24,10 @@
# source: voltha-e2e.yaml
jobs:
- 'voltha-periodic-test':
- name: 'periodic-voltha-pm-data-test-bbsim-2.13'
+ name: 'periodic-voltha-pm-data-test-bbsim-2.14'
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
- code-branch: 'voltha-2.13'
+ pipeline-branch: 'voltha-2.14'
+ code-branch: 'voltha-2.14'
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'
@@ -45,10 +45,10 @@
timeout: 140
- 'voltha-periodic-test':
- name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.13'
+ name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.14'
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
- code-branch: 'voltha-2.13'
+ pipeline-branch: 'voltha-2.14'
+ code-branch: 'voltha-2.14'
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
@@ -70,11 +70,11 @@
# md5sum(master): c606493da6ee7cbb18ca8aee97ea2957
# -----------------------------------------------------------------------
- 'voltha-periodic-test':
- name: 'periodic-voltha-test-bbsim-2.13'
- code-branch: 'voltha-2.13'
+ name: 'periodic-voltha-test-bbsim-2.14'
+ code-branch: 'voltha-2.14'
logLevel: 'DEBUG' # force job to regenerate
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
+ pipeline-branch: 'voltha-2.14'
time-trigger: "H H/23 * * *"
testTargets: |
- target: functional-single-kind
@@ -104,12 +104,12 @@
logging: true
- 'voltha-periodic-test':
- name: 'periodic-voltha-dt-test-bbsim-2.13'
+ name: 'periodic-voltha-dt-test-bbsim-2.14'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
build-node: 'ubuntu18.04-basebuild-8c-15g'
pipeline-script: 'voltha/bbsim-tests.groovy'
- pipeline-branch: 'voltha-2.13'
- code-branch: 'voltha-2.13'
+ pipeline-branch: 'voltha-2.14'
+ code-branch: 'voltha-2.14'
time-trigger : '@daily'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master '
testTargets: |
@@ -125,10 +125,10 @@
logging: true
- 'voltha-periodic-test':
- name: 'periodic-voltha-dt-fttb-test-bbsim-2.13'
+ name: 'periodic-voltha-dt-fttb-test-bbsim-2.14'
# build-node: 'ubuntu18.04-basebuild-4c-8g'
build-node: 'ubuntu18.04-basebuild-8c-15g'
- code-branch: 'voltha-2.13'
+ code-branch: 'voltha-2.14'
time-trigger: "H H/23 * * *"
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF --set onu=2'
testTargets: |
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 82c03b6..d06c578 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -1,9 +1,9 @@
---
# VOLTHA 2.x scale measurements
-- _voltha_213_common: &voltha_213_common
- name: voltha-2.13-common
- pipeline-branch: 'voltha-2.13'
+- _voltha_214_common: &voltha_214_common
+ name: voltha-2.14-common
+ pipeline-branch: 'voltha-2.14'
time-trigger: "H H/4 * * *"
olts: 2
pons: 16
@@ -17,7 +17,7 @@
openonuAdapterImg: ''
openonuAdapterGoImg: ''
onosImg: ''
- release: voltha-2.13
+ release: voltha-2.14
- project:
name: voltha-scale
@@ -311,13 +311,13 @@
extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml"
# -----------------------------------------------------------------------
- # voltha-2.13 Jobs
+ # voltha-2.14 Jobs
# -----------------------------------------------------------------------
- 'voltha-scale-measurements':
- <<: *voltha_213_common
- name: 'voltha-scale-measurements-voltha-2.13-2-16-32-dt-subscribers'
- pipeline-script: 'voltha/voltha-2.13/voltha-scale-test.groovy'
+ <<: *voltha_214_common
+ name: 'voltha-scale-measurements-voltha-2.14-2-16-32-dt-subscribers'
+ pipeline-script: 'voltha/voltha-2.14/voltha-scale-test.groovy'
build-node: 'voltha-scale-1'
workflow: dt
withEapol: false
@@ -326,9 +326,9 @@
extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
- 'voltha-scale-measurements':
- <<: *voltha_213_common
- name: 'voltha-scale-measurements-voltha-2.13-2-16-32-tt-subscribers'
- pipeline-script: 'voltha/voltha-2.13/voltha-scale-test.groovy'
+ <<: *voltha_214_common
+ name: 'voltha-scale-measurements-voltha-2.14-2-16-32-tt-subscribers'
+ pipeline-script: 'voltha/voltha-2.14/voltha-scale-test.groovy'
build-node: 'voltha-scale-1'
workflow: tt
withEapol: false
@@ -337,10 +337,10 @@
extraHelmFlags: "--set dhcpRetry=false -f /home/jenkins/voltha-scale/voltha-values.yaml --set etcd.persistence.enabled=false,etcd.persistence.storageClass=longhorn"
- 'voltha-scale-measurements':
- <<: *voltha_213_common
- name: 'voltha-scale-measurements-2.13-10-stacks-2-16-32-dt-subscribers'
+ <<: *voltha_214_common
+ name: 'voltha-scale-measurements-2.14-10-stacks-2-16-32-dt-subscribers'
build-node: 'voltha-scale-2'
- pipeline-script: 'voltha/voltha-2.13/voltha-scale-multi-stack.groovy'
+ pipeline-script: 'voltha/voltha-2.14/voltha-scale-multi-stack.groovy'
withMonitoring: false
logLevel: WARN
onosReplicas: 1
@@ -355,10 +355,10 @@
extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
- 'voltha-scale-measurements':
- <<: *voltha_213_common
- name: 'voltha-scale-measurements-2.13-10-stacks-2-16-32-tt-subscribers'
+ <<: *voltha_214_common
+ name: 'voltha-scale-measurements-2.14-10-stacks-2-16-32-tt-subscribers'
build-node: 'voltha-scale-2'
- pipeline-script: 'voltha/voltha-2.13/voltha-scale-multi-stack.groovy'
+ pipeline-script: 'voltha/voltha-2.14/voltha-scale-multi-stack.groovy'
withMonitoring: false
logLevel: WARN
onosReplicas: 1
@@ -373,115 +373,6 @@
extraHelmFlags: "-f /home/jenkins/voltha-scale/voltha-values.yaml "
# -----------------------------------------------------------------------
- # -----------------------------------------------------------------------
- # 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'
- pipeline-branch: 'voltha-2.11'
- 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'
- pipeline-branch: 'voltha-2.11'
- 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'
- pipeline-branch: 'voltha-2.11'
- 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':