Removing superflous openonugo job and adding 2.6 DMI job
Change-Id: I905aa8239c9addc5a32888110bd7857321897be3
diff --git a/jjb/pipeline/voltha-DMI-bbsim-tests.groovy b/jjb/pipeline/voltha-DMI-bbsim-tests.groovy
index a4c0341..cbf04b8 100755
--- a/jjb/pipeline/voltha-DMI-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-DMI-bbsim-tests.groovy
@@ -118,7 +118,7 @@
./log-collector.sh > /dev/null &
./log-combine.sh > /dev/null &
- export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR -e SetGetLogLevelDMI -e GetLoggableEntitiesDMI -e SetGetLoggingEndpointDMI"
+ export ROBOT_MISC_ARGS="-d $ROBOT_LOGS_DIR"
make -C $WORKSPACE/voltha-system-tests ${makeTarget} || true
'''
}
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index bc74e82..c215ab6 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -65,32 +65,24 @@
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
- name: 'periodic-voltha-test-bbsim-openonugo'
- pipeline-script: 'voltha-nightly-tests-bbsim.groovy'
- build-node: 'qct-pod4-node2'
- make-target-failtest: bbsim-failurescenarios
- make-target-errortest: bbsim-errorscenarios
- make-target-alarmtest: bbsim-alarms-kind
- make-target-multipleolt: bbsim-multiolt-kind
- withAlarms: true
- make-target: functional-single-kind
- code-branch: 'master'
- work-flow: 'DT'
- extraHelmFlags: 'use_openonu_adapter_go=true,images.adapter_open_onu_go.repository=voltha/voltha-openonu-adapter-go,images.adapter_open_onu_go.tag=master'
- onus: 2
- pons: 2
- time-trigger: "H H/12 * * *"
-
- - 'voltha-periodic-test':
name: 'periodic-voltha-test-DMI'
pipeline-script: 'voltha-DMI-bbsim-tests.groovy'
build-node: 'qct-pod4-node2'
- make-target: voltha-dmi-hw-management-test
+ make-target: bbsim-dmi-hw-management-test
withAlarms: false
code-branch: 'master'
time-trigger: "H H/12 * * *"
- 'voltha-periodic-test':
+ name: 'periodic-voltha-test-DMI-2.6'
+ pipeline-script: 'voltha-DMI-bbsim-tests.groovy'
+ build-node: 'qct-pod4-node2'
+ make-target: bbsim-dmi-hw-management-test
+ withAlarms: false
+ code-branch: 'voltha-2.6'
+ time-trigger: "H H/12 * * *"
+
+ - 'voltha-periodic-test':
name: 'periodic-voltha-test-bbsim-2.6'
pipeline-script: 'voltha-nightly-tests-bbsim.groovy'
build-node: 'qct-pod4-node2'