VOL-1913 has been merged so resume testing voltha-2.1 images
Device delete is working, make that a critical test now
Start periodic system tests on master branch
Change-Id: I57941c74c10bb88df53e2d2b33a4c14931e3308e
diff --git a/jjb/pipeline/voltha-go-tests.groovy b/jjb/pipeline/voltha-go-tests.groovy
index d14d398..356a837 100644
--- a/jjb/pipeline/voltha-go-tests.groovy
+++ b/jjb/pipeline/voltha-go-tests.groovy
@@ -54,7 +54,7 @@
export VOLTCONFIG="/home/jenkins/.volt/config-minimal"
export PATH=/w/workspace/voltha-system-tests/kind-voltha/bin:$PATH
cd $WORKSPACE/voltha-system-tests/tests/sanity
- robot -v ONOS_REST_PORT:8181 -v ONOS_SSH_PORT:8101 -e notready --critical sanity --noncritical VOL-1705 -v num_onus:1 sanity.robot || true
+ robot -v ONOS_REST_PORT:8181 -v ONOS_SSH_PORT:8101 -e notready --critical sanity -v num_onus:1 sanity.robot || true
'''
}
}
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 4d9abaf..4930be0 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -10,6 +10,11 @@
- 'voltha-periodic-test':
name: 'voltha-system-tests'
pipeline: 'voltha-go-tests.groovy'
+ default-image-tag: 'voltha-2.1'
+ - 'voltha-periodic-test':
+ name: 'voltha-system-tests-master'
+ pipeline: 'voltha-go-tests.groovy'
+ default-image-tag: 'master'
- job-template:
id: 'voltha-periodic-test'
@@ -58,7 +63,7 @@
- string:
name: extraHelmFlags
- default: '--set defaults.image_tag=voltha-2.1,images.afrouter.repository=andybavier/voltha-afrouter,images.afrouter.tag=vol-1913,images.rw_core.repository=andybavier/voltha-rw-core,images.rw_core.tag=vol-1913'
+ default: '--set defaults.image_tag={default-image-tag},wpa_wait=10,dhcp_wait=10'
description: 'Helm flags to pass to ./voltha up'
project-type: pipeline