Switch voltha-bbsim system test to use VOLTHA 2.x
Change-Id: I72fb24ea74d4274a65cc1b98b9d3cd72574cb19c
diff --git a/jjb/verify/voltha-bbsim.yaml b/jjb/verify/voltha-bbsim.yaml
index f459d87..d5c5aaa 100644
--- a/jjb/verify/voltha-bbsim.yaml
+++ b/jjb/verify/voltha-bbsim.yaml
@@ -21,6 +21,8 @@
unit-test-targets: 'test docker-build'
dest-gopath: "github.com/opencord"
junit-allow-empty-results: true
+ - 'voltha-patch-test':
+ pipeline: 'voltha-bbsim-tests.groovy'
- job-group:
name: 'publish-voltha-bbsim-jobs'
diff --git a/jjb/voltha-atest-provisioning.yaml b/jjb/voltha-atest-provisioning.yaml
index ebce3ce..757df3f 100644
--- a/jjb/voltha-atest-provisioning.yaml
+++ b/jjb/voltha-atest-provisioning.yaml
@@ -8,7 +8,6 @@
jobs:
- 'voltha-atest-provisioning'
- - 'voltha-atest-bbsim'
- job-template:
id: voltha-atest-provisioning
@@ -79,75 +78,3 @@
concurrent: false
dsl: !include-raw-escape: pipeline/voltha-atest-provisioning.groovy
-
-- job-template:
- id: voltha-atest-bbsim
- name: 'voltha-atest-bbsim'
- description: |
- Created by {id} job-template from ci-management/jjb/voltha-atest-provisioning.yaml
- Voltha automated tests run per commit. Voltha testing with bbsim to validate voltha+bbsim
-
- triggers:
- - cord-infra-gerrit-trigger-patchset:
- gerrit-server-name: '{gerrit-server-name}'
- project-regexp: 'voltha-bbsim'
- branch-regexp: '{supported-branches-regexp}'
- dependency-jobs: '{dependency-jobs}'
- file-include-regexp: '{all-files-regexp}'
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- artifact-num-to-keep: '{artifact-num-to-keep}'
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: '{build-timeout}'
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
- parameters:
- - string:
- name: executorNode
- default: 'qct-pod3-voltha-testing'
- description: 'Name of the Jenkins node to run the job on'
-
- - string:
- name: manifestUrl
- default: '{gerrit-server-url}/{cord-repo-manifest}'
- description: 'URL to the repo manifest'
-
- - string:
- name: manifestBranch
- default: 'master'
- description: 'Name of the repo branch to use'
-
- - string:
- name: gerritChangeNumber
- default: '$GERRIT_CHANGE_NUMBER'
- description: 'Changeset number in Gerrit'
-
- - string:
- name: gerritPatchsetNumber
- default: '$GERRIT_PATCHSET_NUMBER'
- description: 'PatchSet number in Gerrit'
-
- - string:
- name: adapter
- default: 'bbsim'
- description: 'virtual olt to install with voltha'
-
- - bool:
- name: BuildVoltha
- default: false
- description: 'Build modified voltha component'
-
- - bool:
- name: BuildBbsim
- default: true
- description: 'Build modified bbsim component'
-
-
- project-type: pipeline
- concurrent: false
-
- dsl: !include-raw-escape: pipeline/voltha-atest-provisioning.groovy