summaryrefslogtreecommitdiffstats
path: root/jjb/infra
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-01-27 17:01:33 +0000
committerMarkos Chandras <mchandras@suse.de>2017-01-27 17:07:05 +0000
commitf3aa5990d31c7647c497942bb9816618507bdd3d (patch)
tree4b028b81de6b739b35a82d6b5b6e916d7d7d93ad /jjb/infra
parentc0bab8938479ed5b30858c2583e8f0ef69b65aa8 (diff)
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>
Diffstat (limited to 'jjb/infra')
-rw-r--r--jjb/infra/bifrost-verify-jobs.yml9
1 files changed, 3 insertions, 6 deletions
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