]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commit
ceph-dev-*-build: reset CI_CONTAINER when building octopus for el7 1700/head
authorKefu Chai <kchai@redhat.com>
Thu, 2 Jul 2020 13:29:15 +0000 (21:29 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 12 Nov 2020 05:40:47 +0000 (13:40 +0800)
commita3f26c8ab781a5ffe54aedf45be9e373bede4d6c
tree462129dab00f299bb3ae3ca307c67db91de1eca9
parentce8d164e05b255ef6a23f74b9b313a463e7c245f
ceph-dev-*-build: reset CI_CONTAINER when building octopus for el7

because the consumers of ceph container images are referencing the
required images using
"${CONTAINER_REPO_HOSTNAME}/${CONTAINER_REPO_ORGANIZATION}/ceph:${SHA1}".
see ceph-container/contrib/build-push-ceph-container-imgs.sh.

but in a recent change, we push both the images built for el7 and for
el8 with the same tag. and the last one wins. this breaks the tests
which expect the cephadm and other tools included in an image built for
el8. but these tools are not included by el7 because of the missing
dependencies.

so we have at least two options

- stop building octopus+el7 container images
- use a different tag for octopus+el7 to avoid the racing and name collision.

before the 2nd change lands on ceph-container, we should have the 1st
one in ceph-build to unblock the builds of octopus.

Fixes: https://tracker.ceph.com/issues/48162
Signed-off-by: Kefu Chai <kchai@redhat.com>
ceph-dev-build/build/build_rpm
ceph-dev-new-build/build/build_rpm
scripts/build_utils.sh