Merge "set pipeline-branch and pipeline-script for all job definitions"
diff --git a/jjb/repos/voltha-helm-charts.yaml b/jjb/repos/voltha-helm-charts.yaml
index 80f86ef..54c9caf 100644
--- a/jjb/repos/voltha-helm-charts.yaml
+++ b/jjb/repos/voltha-helm-charts.yaml
@@ -44,12 +44,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- 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'
# - job-group:
# name: 'verify-voltha-helm-charts-jobs-voltha-2.8'
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index 91c5bdd..e38f410 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -42,12 +42,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- 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'
- job-group:
name: 'publish-bbsim-sadis-server-jobs'
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 4b85faa..9ea49c0 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -88,6 +88,7 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
testTargets: |
- target: sanity-bbsim-att
@@ -111,6 +112,7 @@
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
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index de4fad4..4428e44 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -43,18 +43,20 @@
jobs:
- 'voltha-patch-test':
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.12'
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
# - job-group:
# name: 'verify-ofagent-jobs-voltha-2.8'
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index b1b80b5..d56d589 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -36,6 +36,7 @@
junit-allow-empty-results: true
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.11'
- job-group:
name: 'verify-voltha-api-server-jobs-voltha-2.8'
@@ -51,6 +52,7 @@
junit-allow-empty-results: true
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.8'
- job-group:
name: 'publish-voltha-api-server-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 7b508a0..28984ac 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -51,12 +51,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- 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'
# - job-group:
# name: 'verify-voltha-go-jobs-voltha-2.8'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 6779887..8baf4cf 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -36,13 +36,15 @@
name: 'verify-voltha-onos-jobs-voltha-2.12'
jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+ pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- 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'
#- job-group:
# name: 'verify-voltha-onos-jobs-voltha-2.8'
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index b0ddefe..9c490dc 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -53,12 +53,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- job-group:
name: 'verify-voltha-openolt-adapter-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: 'publish-voltha-openolt-adapter-jobs'
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 574d1c1..2761bb9 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -50,12 +50,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- 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'
#- job-group:
# name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8'
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index b62dd2b..1395136 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -44,12 +44,14 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
- 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'
#- job-group:
# name: 'verify-voltha-system-tests-jobs-voltha-2.8'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 03a0b68..3051db8 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -87,6 +87,7 @@
- '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'
@@ -116,6 +117,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multiple-olts-test-bbsim-2.12'
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
code-branch: 'voltha-2.12'
olts: 2
extraHelmFlags: '--set onu=2,pon=2'
@@ -218,6 +220,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multi-uni-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 voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
time-trigger: "H H/23 * * *"
@@ -241,6 +244,7 @@
- '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 * * *"
@@ -291,6 +295,7 @@
- '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'
@@ -316,6 +321,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multi-uni-multiple-olts-test-bbsim-2.12'
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
code-branch: 'voltha-2.12'
olts: 2
extraHelmFlags: '--set onu=2,pon=2 --set voltha-adapter-openonu.adapter_open_onu.uni_port_mask=0x00FF'
@@ -523,6 +529,7 @@
- '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'
@@ -632,6 +639,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-openonu-go-test-bbsim-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 * * *"
logLevel: 'DEBUG'
@@ -915,6 +923,7 @@
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'
@@ -1016,6 +1025,7 @@
name: 'patchset-voltha-2.12-openonu-go-test-bbsim'
trigger-comment: "voltha 2.12 test openonu singleolt"
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
code-branch: '$GERRIT_BRANCH'
gerritProject: '$GERRIT_PROJECT'
gerritRefspec: '$GERRIT_REFSPEC'
@@ -1243,6 +1253,7 @@
- '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
@@ -1314,6 +1325,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-multiple-olts-openonu-go-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'
olts: 2
@@ -1517,6 +1529,7 @@
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'
@@ -1590,6 +1603,7 @@
name: 'patchset-voltha-2.12-multiple-olts-openonu-go-test-bbsim'
trigger-comment: "voltha 2.12 test openonu multiolt"
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
code-branch: '$GERRIT_BRANCH'
gerritProject: '$GERRIT_PROJECT'
gerritRefspec: '$GERRIT_REFSPEC'
@@ -1747,6 +1761,7 @@
- '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: |
@@ -1759,6 +1774,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-test-DMI-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: |
@@ -1800,6 +1816,7 @@
- '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'
@@ -1814,6 +1831,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-etcd-test-2.12'
pipeline-script: 'voltha/voltha-2.12/bbsim-tests.groovy'
+ pipeline-branch: 'voltha-2.12'
build-node: 'ubuntu18.04-basebuild-4c-8g'
code-branch: 'voltha-2.12'
extraHelmFlags: '--set onu=2,pon=2'
@@ -1856,6 +1874,7 @@
- 'voltha-periodic-test':
name: 'periodic-voltha-unitag-subscriber-tt-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 onos-classic.replicas=3,onos-classic.atomix.replicas=3 --set voltha.onos_classic.replicas=3 '
time-trigger: "H H/23 * * *"
@@ -1881,6 +1900,7 @@
- '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 * * *"
@@ -1942,6 +1962,7 @@
name: 'periodic-voltha-memory-leak-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: "H H/23 * * *"
withMonitoring: true
@@ -1958,6 +1979,7 @@
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
diff --git a/jjb/voltha-test/voltha.yaml b/jjb/voltha-test/voltha.yaml
index 55ffd2e..0b01f31 100644
--- a/jjb/voltha-test/voltha.yaml
+++ b/jjb/voltha-test/voltha.yaml
@@ -453,6 +453,7 @@
disable-job: true
release: 'voltha-2.11'
branch: 'voltha-2.11'
+ pipeline-script: 'voltha/voltha-2.11/physical-build.groovy'
pipeline-branch: 'voltha-2.11'
name-extension: '_TT'
work-flow: 'TT'
@@ -469,6 +470,7 @@
disable-job: true
release: 'voltha-2.12'
branch: 'voltha-2.12'
+ pipeline-script: 'voltha/voltha-2.12/physical-build.groovy'
pipeline-branch: 'voltha-2.12'
name-extension: '_TT'
work-flow: 'TT'
@@ -662,6 +664,7 @@
work-flow: 'DT'
release: '2.11'
branch: 'voltha-2.11'
+ pipeline-script: 'voltha/voltha-2.11/dmi-build-and-test.groovy'
pipeline-branch: 'voltha-2.11'
profile: 'Default'
installVolthaInfra: true
@@ -686,6 +689,7 @@
work-flow: 'DT'
release: '2.12'
branch: 'voltha-2.12'
+ pipeline-script: 'voltha/voltha-2.12/dmi-build-and-test.groovy'
pipeline-branch: 'voltha-2.12'
profile: 'Default'
installVolthaInfra: true