Merge "Fix for missing omec-deploy-staging configuration"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 9a9785b..7d84ef2 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -21,7 +21,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
profile: '1T4GEM'
# flex pod1 test job - using voltha branch
@@ -41,7 +41,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
profile: '1T4GEM'
# onlab pod1 test job - BAL3.1 tests using voltha branch
@@ -61,7 +61,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
configurePod: true
profile: 'Default'
time: '1'
@@ -84,7 +84,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
configurePod: true
profile: '1T4GEM'
time: '3'
@@ -107,7 +107,7 @@
branch: 'voltha-2.3'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
configurePod: true
profile: '1T4GEM'
time: '4'
@@ -130,7 +130,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
configurePod: true
profile: 'Default'
time: '1'
@@ -152,7 +152,7 @@
branch: 'voltha-2.3'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
configurePod: true
profile: 'Default'
time: '3'
@@ -174,7 +174,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
configurePod: true
profile: '1T4GEM'
time: '4'
@@ -198,7 +198,7 @@
work-flow: 'DT'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
configurePod: true
profile: '1T8GEM'
time: '6'
@@ -222,7 +222,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
configurePod: true
profile: '1T4GEM'
- 'build_pod_test':
@@ -265,7 +265,7 @@
oltDebVersion: 'openolt_asfvolt16.deb'
configurePod: true
profile: 'Default'
- time: '7'
+ time: '10'
# infosys test job - uses Default tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -287,7 +287,7 @@
oltDebVersion: 'openolt_asfvolt16.deb'
configurePod: true
profile: 'Default'
- time: '10'
+ time: '12'
# infosys test job - voltha-2.3 release job, uses Default tech profile on voltha branch
- 'build_voltha_pod_test':
@@ -307,7 +307,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
configurePod: true
profile: 'Default'
with-kind: true
@@ -332,7 +332,7 @@
branch: 'voltha-2.3'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-build'
- oltDebVersion: 'openolt-2.3.0.deb'
+ oltDebVersion: 'openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb'
configurePod: true
profile: 'Default'
with-kind: true
@@ -348,3 +348,32 @@
test-repo: 'voltha-system-tests'
profile: 'Default'
power-switch: True
+
+ # Berlin pod with gpon olt/onu - master Default tech profile and timer based job
+ - 'build_voltha_pod_release':
+ build-node: 'dt-berlin-community-pod'
+ config-pod: 'dt-berlin-pod-gpon'
+ release: 'master'
+ branch: 'master'
+ name-extension: '_DT'
+ work-flow: 'DT'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ oltDebVersion: 'openolt_asgvolt64.deb'
+ configurePod: true
+ profile: '1T8GEM'
+ with-kind: true
+ time: '11'
+
+
+ # Berlin POD test job - master versions: uses tech profile on voltha branch
+ - 'build_voltha_pod_test':
+ build-node: 'dt-berlin-community-pod'
+ config-pod: 'dt-berlin-pod-gpon'
+ name-extension: '_DT'
+ release: 'master'
+ branch: 'master'
+ test-repo: 'voltha-system-tests'
+ profile: '1T8GEM'
+ power-switch: True
+ pipeline-script: 'voltha-dt-physical-functional-tests.groovy'
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d2a34bd..938e93d 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -71,9 +71,9 @@
# regexp for gerrit triggers
# list of supported branches, for branch-regexp
all-branches-regexp: '.*'
- supported-branches-regexp: '^(master|cord-7.0|cord-6.1|seba-1.0)$'
+ supported-branches-regexp: '^(master|cord-7.0|cord-6.1|seba-1.0|voltha-2.3)$'
legacy-branches-regexp: '^(cord-5.0|cord-4.1|cord-4.0)$'
- modern-branches-regexp: '^(master|cord-7.0|cord-6.1|cord-6.0|seba-1.0)$'
+ modern-branches-regexp: '^(master|cord-7.0|cord-6.1|cord-6.0|seba-1.0|voltha-2.3)$'
platform-branches-regexp: '^(master|cord-7.0|cord-6.1)$'
seba-branches-regexp: '^(master|cord-7.0|seba-1.0)$'
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index 12aad0a..6301abe 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -7,7 +7,7 @@
jobs:
- 'verify-voltha-helm-charts-jobs':
- branch-regexp: '{modern-branches-regexp}'
+ branch-regexp: '{all-branches-regexp}'
- job-group:
name: 'verify-voltha-helm-charts-jobs'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index d1a1b23..1cba69b 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -330,7 +330,7 @@
project-pattern: '^{project}$'
branches:
- branch-compare-type: REG_EXP
- branch-pattern: '^(master|voltha-2.3)$'
+ branch-pattern: '{all-branches-regexp}'
file-paths:
- compare-type: REG_EXP
pattern: '{all-files-regexp}'
@@ -471,7 +471,7 @@
project-pattern: '^(voltha-openolt-adapter|voltha-openonu-adapter|voltha-go)$'
branches:
- branch-compare-type: REG_EXP
- branch-pattern: '^(master|voltha-2.3)$'
+ branch-pattern: '{all-branches-regexp}'
- job-template:
@@ -609,7 +609,7 @@
project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests|ofagent-py|ofagent-go|voltha-onos)$'
branches:
- branch-compare-type: REG_EXP
- branch-pattern: '^(master|voltha-2.3)$'
+ branch-pattern: '{all-branches-regexp}'
- job-template: