1
0
mirror of https://github.com/ceph/ceph synced 2024-12-22 11:31:55 +00:00

buildpackages: use architecture suffixed images

Signed-off-by: Loic Dachary <loic@dachary.org>
This commit is contained in:
Loic Dachary 2016-03-25 15:36:55 +01:00
parent 40277ca6a9
commit f9c4858a26
2 changed files with 6 additions and 4 deletions
tasks

View File

@ -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)

View File

@ -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 --wait $@" EXIT ; \