commit 5dcdb85adfb69e062bbe541eb40b48a4d20ec866
author Jakub Josef <jjosef@mirantis.com> Thu Aug 31 10:03:22 2017 +0000
committer Gerrit Code Review <gerrit2@b3fef64565ee> Thu Aug 31 10:03:25 2017 +0000
tree b2a5a0769f1af4837e191926f4fb8986332675cd
parent c4f984dad6e70ea3120a17feca93fbec367d92d0
parent 66a109a179930fd200edf1d7f1705c3ed0dc41d8

Merge "Enable drivetrain deployment job"

jenkins/client/job/validate.yml

diff --git a/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index 6f22a0c..5a2c616 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -56,3 +56,24 @@
             TEST_K8S_CONFORMANCE_IMAGE:
               type: string
               default: "docker-dev-virtual.docker.mirantis.net/mirantis/kubernetes/k8s-conformance:v1.5.1-3_1482332392819"
+            RUN_SPT_TESTS:
+              type: boolean
+              default: 'true'
+            SPT_SSH_USER:
+              type: string
+              default: "root"
+            SPT_FLOATING_NETWORK:
+              type: string
+              default: ""
+            SPT_IMAGE:
+              type: string
+              default: ""
+            SPT_USER:
+              type: string
+              default: ""
+            SPT_FLAVOR:
+              type: string
+              default: ""
+            SPT_AVAILABILITY_ZONE:
+              type: string
+              default: "nova"

nova/client/flavor/default.yml

diff --git a/nova/client/flavor/default.yml b/nova/client/flavor/default.yml
index 492530d..1d374c5 100644
--- a/nova/client/flavor/default.yml
+++ b/nova/client/flavor/default.yml
@@ -61,4 +61,4 @@
             m1.large100:
               ram: 8096
               disk: 100
-            	vcpus: 4
+              vcpus: 4