From a093305e070466f497b07d69f4f0d30349ba01e5 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Tue, 5 Apr 2016 10:45:37 +0200 Subject: [PATCH] openstack: teuthology must use aarch64, not arm64 teuthology / gitbuilder / ansible_architecture arch is dpkg-architecture --query DEB_HOST_GNU_CPU (x86_64 and aarch64) deb package Architectures: (conf/distributions) is dpkg-architecture --query DEB_HOST_GNU_ARCH (amd64 and arm64) Signed-off-by: Loic Dachary --- scripts/lock.py | 2 +- teuthology/openstack/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lock.py b/scripts/lock.py index 76b81d95ea..939800a495 100644 --- a/scripts/lock.py +++ b/scripts/lock.py @@ -162,7 +162,7 @@ def parse_args(argv): parser.add_argument( '--arch', default=None, - help='architecture (x86_64, i386, armv7, arm64)', + help='architecture (x86_64, i386, armv7, aarch64)', ) parser.add_argument( '--json-query', diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py index 27badf8550..66d8ffda02 100644 --- a/teuthology/openstack/__init__.py +++ b/teuthology/openstack/__init__.py @@ -197,7 +197,7 @@ class OpenStack(object): 'opensuse-42.1-x86_64': 'http://download.opensuse.org/repositories/Cloud:/Images:/Leap_42.1/images/openSUSE-Leap-42.1-OpenStack.x86_64.qcow2', 'opensuse-42.2-x86_64': 'http://download.opensuse.org/repositories/Cloud:/Images:/Leap_42.2/images/openSUSE-Leap-42.2-OpenStack.x86_64.qcow2', 'ubuntu-14.04-x86_64': 'https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img', - 'ubuntu-14.04-arm64': 'https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-arm64-disk1.img', + 'ubuntu-14.04-aarch64': 'https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-arm64-disk1.img', 'ubuntu-14.04-i686': 'https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-i386-disk1.img', 'ubuntu-16.04-x86_64': 'https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img', 'ubuntu-16.04-aarch64': 'https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-disk1.img', @@ -605,7 +605,7 @@ class OpenStack(object): if (self.get_provider() == 'cloudlab' or (self.get_provider() == 'runabove' and 'HZ1' in os.environ.get('OS_REGION_NAME', ''))): - return ('arm64',) + return ('aarch64',) else: return ('x86_64', 'i686') -- 2.39.5