From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Dec 2019 23:11:47 +0000 (-0600)
Subject: qa/suites/rbd/openstack: use 18.04, not 16.04
X-Git-Tag: v15.1.0~457^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32284%2Fhead;p=ceph.git

qa/suites/rbd/openstack: use 18.04, not 16.04

Signed-off-by: Sage Weil <sage@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 5e168462a97..a2d51a6d7f3 100644
--- a/qa/suites/rbd/openstack/workloads/devstack-tempest-gate.yaml
+++ b/qa/suites/rbd/openstack/workloads/devstack-tempest-gate.yaml
@@ -8,7 +8,7 @@ tasks:
       - image_size: 30720
       - image_size: 30720
       test: qa/workunits/rbd/run_devstack_tempest.sh
-      image_url: https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
+      image_url: https://cloud-images.ubuntu.com/releases/18.04/release/ubuntu-18.04-server-cloudimg-amd64-disk1.img
       cloud_config_archive:
       - type: text/cloud-config
         content: |
@@ -27,7 +27,7 @@ tasks:
       - |
         #!/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"
+        wget -q -O /etc/apt/sources.list.d/ceph.list "https://shaman.ceph.com/api/repos/ceph/{ceph_branch}/{ceph_sha1}/ubuntu/bionic/repo"
         apt-get update
 
         mount --bind /mnt/test_b /opt