From: Loic Dachary <ldachary@redhat.com>
Date: Sat, 19 Mar 2016 09:57:50 +0000 (+0100)
Subject: buildpackages: provision a small build machine for tests
X-Git-Tag: v10.2.6~165^2^2~151^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1cc657798aa0fc7eeebc6de06074e7caca42b24e;p=ceph.git

buildpackages: provision a small build machine for tests

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/suites/buildpackages/tests/tasks/release.yaml b/suites/buildpackages/tests/tasks/release.yaml
index abfb5962ffae2..94bbeda5d9a32 100644
--- a/suites/buildpackages/tests/tasks/release.yaml
+++ b/suites/buildpackages/tests/tasks/release.yaml
@@ -2,6 +2,11 @@
 overrides:
    ansible.cephlab:
      playbook: users.yml
+   buildpackages:
+     machine:
+       disk: 10 # GB
+       ram: 1000 # MB
+       cpus: 1
 roles:
     - [client.0]
 tasks:
diff --git a/tasks/buildpackages.py b/tasks/buildpackages.py
index 8317e704af1c9..a0d0a5eac03c7 100644
--- a/tasks/buildpackages.py
+++ b/tasks/buildpackages.py
@@ -123,12 +123,25 @@ def task(ctx, config):
           ram: 15000 # MB
           cpus: 16
     - install:
+
+    When a buildpackages task is already included, the values it contains can be
+    overriden with:
+
+    overrides:
+      buildpackages:
+        machine:
+          disk: 10 # GB
+          ram: 1000 # MB
+          cpus: 1
+
     """
     log.info('Beginning buildpackages...')
     if config is None:
         config = {}
     assert isinstance(config, dict), \
         'task only accepts a dict for config not ' + str(config)
+    overrides = ctx.config.get('overrides', {})
+    misc.deep_merge(config, overrides.get('buildpackages', {}))
     d = os.path.join(os.path.dirname(__file__), 'buildpackages')
     os_type = misc.get_distro(ctx)
     os_version = misc.get_distro_version(ctx)