summaryrefslogtreecommitdiffstats
path: root/jjb/xci
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-03-24 10:43:35 +0100
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2017-03-24 10:43:35 +0100
commit961c6ae6880752fcfc87bcce007b0e29b69c5fc1 (patch)
tree0677aa2c1e31d8bcc0cbd0d96eb332052a2ba1b8 /jjb/xci
parent01508737693731742269326d6ae92a17bebea433 (diff)
xci: Fix where the vm_defaults are placed
Change-Id: I3d9d9b8b7c3de0c22a62945de027b9e8994d35e8 Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/xci')
-rw-r--r--jjb/xci/xci-daily-jobs.yml26
1 files changed, 13 insertions, 13 deletions
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index b79f71195..1f4e50be2 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -62,19 +62,6 @@
extra-dib-elements: 'openssh-server'
#--------------------------------
-# VM defaults
-#--------------------------------
-- defaults:
- name: daily_vm_defaults
- test-vm-num-nodes: '6'
- test-vm-node-names: 'xcimaster controller00 controller01 controller02 compute00 compute01'
- vm-domain-type: 'kvm'
- vm-cpu: '8'
- vm-disk: '100'
- vm-memory-size: '16384'
- vm-disk-cache: 'unsafe'
-
-#--------------------------------
# Phases
#--------------------------------
phase:
@@ -89,6 +76,19 @@
- 'xci-{phase}-{pod}-{distro}-daily-{stream}'
#--------------------------------
+# VM defaults
+#--------------------------------
+- defaults:
+ name: daily_vm_defaults
+ test-vm-num-nodes: '6'
+ test-vm-node-names: 'xcimaster controller00 controller01 controller02 compute00 compute01'
+ vm-domain-type: 'kvm'
+ vm-cpu: '8'
+ vm-disk: '100'
+ vm-memory-size: '16384'
+ vm-disk-cache: 'unsafe'
+
+#--------------------------------
# job templates
#--------------------------------
- job-template: