From: Markos Chandras <mchandras@suse.de>
Date: Fri, 27 Jan 2017 17:01:33 +0000 (+0000)
Subject: jjb: infra: bifrost-verify: Use the same defaults on all slaves
X-Git-Tag: danube.1.0~409
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f3aa5990d31c7647c497942bb9816618507bdd3d;p=releng.git

jjb: infra: bifrost-verify: Use the same defaults on all slaves

We are now using virtual machines as slaves so use the same defaults
everywhere

Change-Id: I2260b859aa031106e1458dd8af697919122c0b77
Signed-off-by: Markos Chandras <mchandras@suse.de>
---

diff --git a/jjb/infra/bifrost-verify-jobs.yml b/jjb/infra/bifrost-verify-jobs.yml
index 28e36aac6..d268f8326 100644
--- a/jjb/infra/bifrost-verify-jobs.yml
+++ b/jjb/infra/bifrost-verify-jobs.yml
@@ -38,9 +38,6 @@
             dib-os-element: 'opensuse-minimal'
             dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
             extra-dib-elements: 'openssh-server'
-            vm-disk: '30'
-            vm-memory: '4096'
-            vm-cpu: '2'
 #--------------------------------
 # type
 #--------------------------------
@@ -57,9 +54,9 @@
 #--------------------------------
 - defaults:
     name: vm_defaults
-    vm-disk: '100'
-    vm-memory: '8192'
-    vm-cpu: '4'
+    vm-disk: '30'
+    vm-memory: '4096'
+    vm-cpu: '2'
 
 #--------------------------------
 # job templates