Stop using docker install script

As this script fails vs xenial, let's update ubuntu
and install the official package.

Change-Id: Iba4124429bcd80280f6c5d128758ca72f00bb8f7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index c9fafa9..72e8855 100644 (file)
--- a/functest/ci/download_images.sh
+++ b/functest/ci/download_images.sh
@@ -9,6 +9,7 @@ cat << EOF  | wget ${wget_opts} -i - -P ${1:-/home/opnfv/functest/images}
 http://download.cirros-cloud.net/0.6.0/cirros-0.6.0-x86_64-disk.img
 https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-amd64-disk1.img
 https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img
+https://cloud-images.ubuntu.com/releases/18.04/release/ubuntu-18.04-server-cloudimg-amd64.img
 http://download.cirros-cloud.net/0.6.0/cirros-0.6.0-aarch64-disk.img
 http://repository.cloudifysource.org/cloudify/19.01.24/community-release/cloudify-docker-manager-community-19.01.24.tar
 http://testresults.opnfv.org/functest/vyos-1.1.8-amd64.qcow2

diff --git a/functest/core/cloudify.py b/functest/core/cloudify.py
index 416fe52..966d336 100644 (file)
--- a/functest/core/cloudify.py
+++ b/functest/core/cloudify.py
@@ -29,7 +29,7 @@ class Cloudify(singlevm.SingleVm2):
     __logger = logging.getLogger(__name__)
 
     filename = ('/home/opnfv/functest/images/'
-                'ubuntu-16.04-server-cloudimg-amd64-disk1.img')
+                'ubuntu-18.04-server-cloudimg-amd64.img')
     flavor_ram = 4096
     flavor_vcpus = 2
     flavor_disk = 40
@@ -64,9 +64,8 @@ class Cloudify(singlevm.SingleVm2):
         scpc.put(self.cloudify_archive,
                  remote_path=os.path.basename(self.cloudify_archive))
         (_, stdout, stderr) = self.ssh.exec_command(
-            "sudo wget https://get.docker.com/ -O script.sh && "
-            "sudo chmod +x script.sh && "
-            "sudo ./script.sh && "
+            "sudo apt-get update && "
+            "sudo apt-get install -y docker.io && "
             "sudo docker load -i "
             f"~/{os.path.basename(self.cloudify_archive)} && "
             "sudo docker run --name cfy_manager_local -d "