voltha-e2e voltha-scale software-upgrades: use scm and branched scripts
* use pipeline-scm to pull pipeline-script directly from ci-management
git repository instead of parsing it via dsl
* checkout specific pipeline-branch for each pipeline definition to
align tests with voltha release
* align voltha-scale, voltha-e2e and software-upgrades tests with
changes done for voltha-test in gerrit change #34686 and #34682 for
ci-management repo
Signed-off-by: Jan Klare <jan.klare@bisdn.de>
Change-Id: I28710413f7a0b1bcc6b7aa02d5196a0e7f1f50a4
Signed-off-by: Jan Klare <jan.klare@bisdn.de>
diff --git a/jjb/voltha-e2e/master.yaml b/jjb/voltha-e2e/master.yaml
index f3baff1..0710265 100644
--- a/jjb/voltha-e2e/master.yaml
+++ b/jjb/voltha-e2e/master.yaml
@@ -86,6 +86,7 @@
# 20230828 - show in the jenkins UI but w/o updates.
# ---------------------------------------------------------
pipeline-script: 'voltha/master/bbsim-tests.groovy'
+ pipeline-branch: 'master'
time-trigger: "H H/23 * * *" # Build daily at 11pm
# time-trigger: "H/30 * * * *" # Build every 30 min
testTargets: |
@@ -154,6 +155,7 @@
name: 'periodic-voltha-dt-test-bbsim-master'
build-node: 'ubuntu18.04-basebuild-4c-8g'
pipeline-script: 'voltha/master/bbsim-tests.groovy'
+ pipeline-branch: 'master'
code-branch: 'master'
time-trigger: "@daily"
testTargets: |
diff --git a/jjb/voltha-e2e/voltha-2.11.yaml b/jjb/voltha-e2e/voltha-2.11.yaml
index c43c417..e04b9e1 100644
--- a/jjb/voltha-e2e/voltha-2.11.yaml
+++ b/jjb/voltha-e2e/voltha-2.11.yaml
@@ -27,6 +27,7 @@
- '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 * * *"
@@ -52,6 +53,7 @@
- '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
@@ -78,6 +80,7 @@
- '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 * * *"
@@ -106,6 +109,7 @@
- '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: |
@@ -143,6 +147,7 @@
name: 'periodic-voltha-dt-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: 'master'
time-trigger: "@daily"
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master '
diff --git a/jjb/voltha-e2e/voltha-2.12.yaml b/jjb/voltha-e2e/voltha-2.12.yaml
index 8d10ae0..0e43b55 100644
--- a/jjb/voltha-e2e/voltha-2.12.yaml
+++ b/jjb/voltha-e2e/voltha-2.12.yaml
@@ -27,6 +27,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-pm-data-test-bbsim-2.12'
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
code-branch: 'voltha-2.12'
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 * * *"
@@ -52,6 +53,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.12'
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
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
@@ -83,6 +85,7 @@
code-branch: 'voltha-2.12'
logLevel: 'DEBUG' # force job to regenerate
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
time-trigger: "H H/23 * * *"
testTargets: |
- target: functional-single-kind
@@ -114,6 +117,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-sanity-test-multi-runs-2.12'
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
code-branch: 'voltha-2.12'
time-trigger: "H H/23 * * *"
testTargets: |
@@ -152,6 +156,7 @@
name: 'periodic-voltha-dt-test-bbsim-2.12'
build-node: 'ubuntu18.04-basebuild-4c-8g'
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
code-branch: 'voltha-2.12'
time-trigger : '@daily'
# -----------------------------------------------------------------------
diff --git a/jjb/voltha-e2e/voltha-2.8.yaml b/jjb/voltha-e2e/voltha-2.8.yaml
index 912e530..f7d3227 100644
--- a/jjb/voltha-e2e/voltha-2.8.yaml
+++ b/jjb/voltha-e2e/voltha-2.8.yaml
@@ -27,6 +27,7 @@
name: 'periodic-voltha-pm-data-test-bbsim-2.8-playground'
disable-job: true
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.8'
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 * * *"
@@ -53,6 +54,7 @@
name: 'periodic-voltha-multiple-olts-pm-data-test-bbsim-2.8'
disable-job: true
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.8'
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
@@ -80,6 +82,7 @@
name: 'periodic-voltha-test-bbsim-2.8'
disable-job: true # Reason: deprecated legacy build
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.8'
code-branch: 'voltha-2.8'
time-trigger: "H H/23 * * *"
testTargets: |
@@ -108,6 +111,7 @@
name: 'periodic-voltha-sanity-test-multi-runs-2.8'
disable-job: true
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.8'
code-branch: 'voltha-2.8'
time-trigger: "H H/23 * * *"
testTargets: |