buildpackages: use architecture suffixed images

Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit f9c4858a2693abffffc9fd3ca3e8ac40f973a024)

diff --git a/tasks/buildpackages.py b/tasks/buildpackages.py
index 11ca2e8e7db8a58116b53a82069a208a72b3cfdf..d6de71f59b577d805e5cda991709f8eb360ad2bd 100644 (file)
--- a/tasks/buildpackages.py
+++ b/tasks/buildpackages.py
@@ -174,12 +174,13 @@ def task(ctx, config):
         else:
             select = ''
         openstack.image(os_type, os_version) # create if it does not exist
-        build_flavor = openstack.flavor(config['machine'], select)
+        build_flavor = openstack.flavor(config['machine'], arch, select)
+        default_arch = self.get_default_arch()
         http_flavor = openstack.flavor({
             'disk': 40, # GB
             'ram': 1024, # MB
             'cpus': 1,
-        }, select)
+        }, default_arch, select)
         lock = "/tmp/buildpackages-" + sha1 + "-" + os_type + "-" + os_version
         cmd = (". " + os.environ['HOME'] + "/.ssh_agent ; " +
                " flock --close " + lock +
@@ -196,6 +197,7 @@ def task(ctx, config):
                " CEPH_FLAVOR=" + flavor +
                " BUILD_FLAVOR=" + build_flavor +
                " HTTP_FLAVOR=" + http_flavor +
+               " HTTP_ARCH=" + default_arch +
                " " + target +
                " ")
         log.info("buildpackages: " + cmd)

diff --git a/tasks/buildpackages/Makefile b/tasks/buildpackages/Makefile
index 0380d5a5d8df74a1f9d2ab89d3596bc65bbe70bb..4315ed98d01369fe67b38e01369f57632bb9b5dc 100644 (file)
--- a/tasks/buildpackages/Makefile
+++ b/tasks/buildpackages/Makefile
@@ -30,7 +30,7 @@ ${HOME}/.ssh_agent:
        grep -q ssh_agent ~/.bashrc_teuthology || echo 'source ${HOME}/.ssh_agent' >> ~/.bashrc_teuthology
 
 flock-${PKG_REPO}:
-       openstack server create --image 'teuthology-ubuntu-14.04' --flavor ${HTTP_FLAVOR} --key-name teuthology --security-group teuthology --property ownedby=${MY_IP} --user-data ${PKG_REPO_USER_DATA} --wait ${PKG_REPO}
+       openstack server create --image 'teuthology-ubuntu-14.04-${HTTP_ARCH}' --flavor ${HTTP_FLAVOR} --key-name teuthology --security-group teuthology --property ownedby=${MY_IP} --user-data ${PKG_REPO_USER_DATA} --wait ${PKG_REPO}
        sleep 30
        set -ex ; \
        ip=$(call get_ip,${PKG_REPO}) ; \
@@ -50,7 +50,7 @@ ${PKG_REPO}:
        touch ${D}/$@
 
 ceph-${CEPH_PKG_TYPE}-${CEPH_DIST}-${CEPH_ARCH}-${CEPH_FLAVOR}-${CEPH_SHA1}: ${PKG_REPO}
-       openstack server create --image 'teuthology-${CEPH_OS_TYPE}-${CEPH_OS_VERSION}' --flavor ${BUILD_FLAVOR} --key-name teuthology --security-group teuthology --property ownedby=${MY_IP} --user-data ${CEPH_OS_TYPE}-${CEPH_OS_VERSION}-user-data.txt --wait $@
+       openstack server create --image 'teuthology-${CEPH_OS_TYPE}-${CEPH_OS_VERSION}-${CEPH_ARCH}' --flavor ${BUILD_FLAVOR} --key-name teuthology --security-group teuthology --property ownedby=${MY_IP} --user-data ${CEPH_OS_TYPE}-${CEPH_OS_VERSION}-user-data.txt --wait $@
        sleep 30
        set -ex ; \
        trap "openstack server delete $@" EXIT ; \