Merge "Adding timeouts to voltha-scale-measurements stage"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index dcd61d2..30ad2db 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -136,6 +136,7 @@
branch: 'master'
released: false
name-extension: '_GO'
+ use-ofagent-go: true
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
@@ -164,7 +165,7 @@
released: false
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+ oltDebVersion: 'openolt-2.3.0.deb'
configurePod: true
profile: 'Default'
time: '1'
@@ -212,7 +213,7 @@
released: false
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+ oltDebVersion: 'openolt-2.3.0.deb'
configurePod: true
profile: '1T4GEM-bal31'
time: '4'
@@ -238,7 +239,7 @@
released: false
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+ oltDebVersion: 'openolt-2.3.0.deb'
configurePod: true
profile: 'Default'
time: '6'
@@ -265,7 +266,7 @@
released: false
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+ oltDebVersion: 'openolt-2.3.0.deb'
configurePod: true
profile: '1T4GEM-bal31'
time: '8'
@@ -289,7 +290,7 @@
branch: 'master'
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-bal31-build'
- oltDebVersion: 'openolt_asfvolt16_bal3.2.deb'
+ oltDebVersion: 'openolt-2.3.0.deb'
configurePod: true
profile: '1T4GEM-bal31'
- 'build_pod_test':
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index b1a7413..6363770 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -64,7 +64,12 @@
steps {
sh """
pushd voltha
- repo download "${gerritProject}" "${gerritChangeNumber}/${gerritPatchsetNumber}"
+ if [ "${gerritProject}" != "" -a "${gerritChangeNumber}" != "" -a "${gerritPatchsetNumber}" != "" ]
+ then
+ repo download "${gerritProject}" "${gerritChangeNumber}/${gerritPatchsetNumber}"
+ else
+ echo "No patchset to download!"
+ fi
popd
"""
}
diff --git a/jjb/verify/pyvoltha.yaml b/jjb/verify/pyvoltha.yaml
index 4100715..b8564cb 100644
--- a/jjb/verify/pyvoltha.yaml
+++ b/jjb/verify/pyvoltha.yaml
@@ -11,6 +11,17 @@
- 'publish-pyvoltha-jobs':
branch-regexp: '{all-branches-regexp}'
pypi-index: 'pypi'
+ - 'voltha-periodic-test':
+ name: 'nightly-pyvoltha-compatibility-test'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
+ build-node: 'ubuntu16.04-basebuild-4c-8g'
+ default-image-tag: 'master'
+ code-branch: 'master'
+ make-target: sanity-single-kind
+ gerrit-project: pyvoltha
+ onus: 1
+ pons: 1
+ time-trigger: "@daily"
- job-group:
name: 'verify-pyvoltha-jobs'
@@ -20,9 +31,7 @@
dependency-jobs: 'verify_pyvoltha_licensed'
- 'python-unit-test':
dependency-jobs: 'verify_pyvoltha_tag-collision'
- - 'voltha-patch-test':
- pipeline-script: 'voltha-bbsim-tests.groovy'
- skip-vote: true
+
- job-group:
name: 'publish-pyvoltha-jobs'
diff --git a/jjb/verify/voltha-lib-go.yaml b/jjb/verify/voltha-lib-go.yaml
index fee00c3..9f148ef 100644
--- a/jjb/verify/voltha-lib-go.yaml
+++ b/jjb/verify/voltha-lib-go.yaml
@@ -8,6 +8,17 @@
jobs:
- 'verify-voltha-lib-go-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'voltha-periodic-test':
+ name: 'nightly-voltha-lib-go-compatibility-test'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
+ build-node: 'ubuntu16.04-basebuild-4c-8g'
+ default-image-tag: 'master'
+ code-branch: 'master'
+ make-target: sanity-single-kind
+ gerrit-project: voltha-lib-go
+ onus: 1
+ pons: 1
+ time-trigger: "@daily"
- job-group:
name: 'verify-voltha-lib-go-jobs'
@@ -21,6 +32,3 @@
dest-gopath: "github.com/opencord"
unit-test-targets: 'lint sca test'
unit-test-keep-going: 'true'
- - 'voltha-patch-test':
- pipeline-script: 'voltha-bbsim-tests.groovy'
- skip-vote: true
diff --git a/jjb/verify/voltha-protos.yaml b/jjb/verify/voltha-protos.yaml
index ef7b6ab..98afdb0 100644
--- a/jjb/verify/voltha-protos.yaml
+++ b/jjb/verify/voltha-protos.yaml
@@ -12,6 +12,17 @@
branch-regexp: '{all-branches-regexp}'
pypi-index: 'pypi'
pypi-prep-commands: 'make python-protos'
+ - 'voltha-periodic-test':
+ name: 'nightly-voltha-protos-compatibility-test'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
+ build-node: 'ubuntu16.04-basebuild-4c-8g'
+ default-image-tag: 'master'
+ code-branch: 'master'
+ make-target: sanity-single-kind
+ gerrit-project: voltha-protos
+ onus: 1
+ pons: 1
+ time-trigger: "@daily"
- job-group:
name: 'verify-voltha-protos-jobs'
@@ -23,9 +34,6 @@
build-timeout: 20
unit-test-targets: 'test'
unit-test-keep-going: 'true'
- - 'voltha-patch-test':
- pipeline-script: 'voltha-bbsim-tests.groovy'
- skip-vote: true
- job-group:
name: 'post-merge-voltha-protos-jobs'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index e01e54e..1dff600 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -107,6 +107,8 @@
pipeline-script: 'voltha-go-tests.groovy'
test-runs: 1
robot-args: ''
+ gerrit-project: ''
+
description: |
<!-- Managed by Jenkins Job Builder -->
@@ -150,6 +152,21 @@
description: 'Repo manifest branch for code checkout (so we can display changes in Jenkins)'
- string:
+ name: gerritProject
+ default: '{gerrit-project}'
+ description: 'Name of the Gerrit project'
+
+ - string:
+ name: gerritChangeNumber
+ default: ''
+ description: 'Changeset number in Gerrit'
+
+ - string:
+ name: gerritPatchsetNumber
+ default: ''
+ description: 'PatchSet number in Gerrit'
+
+ - string:
name: testRuns
default: '{test-runs}'
description: 'How many times to repeat the tests'