Merge changes I5117ee3e,I70af797f
* changes:
Using local charts for both voltha-infra and voltha-stack in voltha-scale test
Disabling XOS periodic job
diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index 08eb7d9..13e7a89 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -264,7 +264,7 @@
stackName: "voltha1", // TODO support custom charts
workflow: workflow,
extraHelmFlags: stackHelmFlags,
- localCharts: false,
+ localCharts: localCharts,
])
sh """
set +x
diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
index b1cd814..3e0eebe 100644
--- a/jjb/xos-integration-tests.yaml
+++ b/jjb/xos-integration-tests.yaml
@@ -7,7 +7,8 @@
project-name: 'xos-integration-tests'
jobs:
- - 'data-model-scale'
+ - 'data-model-scale':
+ 'disable-job': true
- 'data-migrations'
- 'data-backup'
- 'att-wf'
@@ -15,6 +16,7 @@
- job-template:
id: 'data-model-scale'
name: 'xos-data-model-scale'
+ disabled: '{disable-job}'
description: |
<!-- Managed by Jenkins Job Builder -->