Test w/released images for Helm chart patches
Change-Id: I2326df42bd9cff543b8a11c81d95e0fc3009947d
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index a4b7a9d..fd88c24 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -21,4 +21,4 @@
dependency-jobs: 'verify_voltha-helm-charts_helm-lint'
build-timeout: 20
pipeline-script: 'voltha-bbsim-tests.groovy'
-
+ extra-helm-flags: '--set defaults.image_tag=null,images.onos.tag=2.2.0'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 8046c28..e95cca0 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -74,11 +74,6 @@
description: 'Name of the Jenkins node to run the job on'
- string:
- name: testTimeout
- default: '90'
- description: 'timeout for olt/onu validations'
-
- - string:
name: extraHelmFlags
default: '--set defaults.image_tag={default-image-tag},onu={onus},pon={pons}'
description: 'Helm flags to pass to ./voltha up'
@@ -100,7 +95,8 @@
- job-template:
id: 'voltha-patch-test'
- name: '{project}_sanity-system-test'
+ name: 'verify_{project}_sanity-test'
+ extra-helm-flags: '--set defaults.image_tag=$GERRIT_BRANCH'
description: |
<!-- Managed by Jenkins Job Builder -->
@@ -149,28 +145,8 @@
description: 'PatchSet number in Gerrit'
- string:
- name: numOnus
- default: '1'
- description: 'Number of onus per pon port'
-
- - string:
- name: emulationMode
- default: '--set emulation_mode=both'
- description: 'Emulation for BBSIM (both|aaa)'
-
- - string:
- name: testTimeout
- default: '90'
- description: 'timeout for olt/onu validations'
-
- - string:
- name: testTags
- default: '-e notready'
- description: 'test tags'
-
- - string:
name: extraHelmFlags
- default: '--set defaults.image_tag=$GERRIT_BRANCH'
+ default: '{extra-helm-flags}'
description: 'Helm flags to pass to ./voltha up'
project-type: pipeline