qa/suites/rbd: ensure guest VM updates to Ceph version under test

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/qa/suites/rbd/openstack/workloads/devstack-tempest-gate.yaml b/qa/suites/rbd/openstack/workloads/devstack-tempest-gate.yaml
index f7c3413a7648bf58726e27d68893219008531f89..38d13ece6d234483e3de717264d72e3cbc6b6a57 100644 (file)
--- a/qa/suites/rbd/openstack/workloads/devstack-tempest-gate.yaml
+++ b/qa/suites/rbd/openstack/workloads/devstack-tempest-gate.yaml
@@ -26,6 +26,10 @@ tasks:
             - "ALL=(root) NOPASSWD:/usr/bin/ovsdb-client"
       - |
         #!/bin/bash -ex
+        wget -q -O- "http://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc" | apt-key add -
+        wget -q -O /etc/apt/sources.list.d/ceph.list "https://shaman.ceph.com/api/repos/ceph/{ceph_branch}/{ceph_sha1}/ubuntu/xenial/repo"
+        apt-get update
+
         mount --bind /mnt/test_b /opt
         mkdir /opt/stack
         chown -R stack:stack /home/stack

diff --git a/qa/tasks/qemu.py b/qa/tasks/qemu.py
index aac51d5f54027ea284d2ccd83fbe62b2cd389bfb..1a95e74242f6a6126107902e8d92b0cdad368940 100644 (file)
--- a/qa/tasks/qemu.py
+++ b/qa/tasks/qemu.py
@@ -170,6 +170,9 @@ def generate_iso(ctx, config):
   /mnt/cdrom/test.sh > /mnt/log/test.log 2>&1 && touch /mnt/log/success
 """ + test_teardown
 
+        user_data = user_data.format(
+            ceph_branch=ctx.config.get('branch'),
+            ceph_sha1=ctx.config.get('sha1'))
         teuthology.write_file(remote, userdata_path, StringIO(user_data))
 
         with file(os.path.join(src_dir, 'metadata.yaml'), 'rb') as f: