From: Nathan Cutler Date: Wed, 25 Apr 2018 19:39:34 +0000 (+0200) Subject: buildpackages: use makecheck image to instantiate build VM X-Git-Tag: 1.1.0~211^2~33 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e4ab9ce2e106c1c7b7a9fe623c5b615ced6f1ef7;p=teuthology.git buildpackages: use makecheck image to instantiate build VM The teuthology images no longer have the right repos for building Ceph. Use the makecheck images instead. Signed-off-by: Nathan Cutler --- diff --git a/teuthology/task/buildpackages/Makefile b/teuthology/task/buildpackages/Makefile index 8ccc323eb..b1ee16b93 100644 --- a/teuthology/task/buildpackages/Makefile +++ b/teuthology/task/buildpackages/Makefile @@ -59,7 +59,7 @@ ${PKG_REPO}: # If it's a weird status, bail out and let the delete fire # eg: ERROR status can happen if there is no VM host without enough capacity for the request. ${SELFNAME}-ceph-${CEPH_PKG_TYPE}-${CEPH_DIST}-${CEPH_ARCH}-${CEPH_FLAVOR}-${CEPH_SHA1}: ${PKG_REPO} - timeout $(TIMEOUT_SERVER_CREATE) openstack server create --image 'teuthology-${CEPH_OS_TYPE}-${CEPH_OS_VERSION}-${CEPH_ARCH}' ${OPENSTACK_NETWORK} --flavor ${BUILD_FLAVOR} --key-name ${KEY_NAME} --security-group ${SEC_GROUP} --property ownedby=${MY_IP} --user-data ${CEPH_OS_TYPE}-${CEPH_OS_VERSION}-user-data.txt --wait $@ + timeout $(TIMEOUT_SERVER_CREATE) openstack server create --image 'makecheck-${CEPH_OS_TYPE}-${CEPH_OS_VERSION}-${CEPH_ARCH}' ${OPENSTACK_NETWORK} --flavor ${BUILD_FLAVOR} --key-name ${KEY_NAME} --security-group ${SEC_GROUP} --property ownedby=${MY_IP} --user-data ${CEPH_OS_TYPE}-${CEPH_OS_VERSION}-user-data.txt --wait $@ set -ex ; \ trap "openstack server delete --wait $@" EXIT ; \ for delay in 30 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 ; do \