From 961c6ae6880752fcfc87bcce007b0e29b69c5fc1 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Fri, 24 Mar 2017 10:43:35 +0100 Subject: xci: Fix where the vm_defaults are placed Change-Id: I3d9d9b8b7c3de0c22a62945de027b9e8994d35e8 Signed-off-by: Fatih Degirmenci --- jjb/xci/xci-daily-jobs.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'jjb/xci/xci-daily-jobs.yml') 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 @@ -61,19 +61,6 @@ dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl' 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 #-------------------------------- @@ -88,6 +75,19 @@ - 'xci-{scenario}-{pod}-{distro}-daily-{stream}' - '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 #-------------------------------- -- cgit 1.2.3-korg