aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2022-11-08 17:14:06 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2022-11-08 17:53:00 +0100
commit8b0cd51410d11a7e2226ed0ff57b009cdf534cf6 (patch)
tree328c9668c11085482ea0d74c67b8cd6bb44a6493
parent6d370c5471e93c7ad5467f2355ba859050f1adf1 (diff)
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> (cherry picked from commit 587d560e6685ed7460d5f51dbaa1edde1fc27175) (cherry picked from commit ed537f467b3dfabc7a6abb05a96f9b4d52c7a8eb)
-rw-r--r--functest/ci/download_images.sh1
-rw-r--r--functest/core/cloudify.py7
2 files changed, 4 insertions, 4 deletions
diff --git a/functest/ci/download_images.sh b/functest/ci/download_images.sh
index 358ccf916..2cbb87a41 100644
--- 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.5.1/cirros-0.5.1-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.5.1/cirros-0.5.1-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 416fe523e..966d33645 100644
--- 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 "