]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
build_utils.sh: Don't build containers for luminous either wip-no-containers-luminous 1613/head
authorDavid Galloway <dgallowa@redhat.com>
Fri, 10 Jul 2020 17:53:13 +0000 (13:53 -0400)
committerDavid Galloway <dgallowa@redhat.com>
Fri, 10 Jul 2020 17:53:13 +0000 (13:53 -0400)
Signed-off-by: David Galloway <dgallowa@redhat.com>
scripts/build_utils.sh

index e13af3fca7b3f43a0dba5db7a875560366165d11..2311a56c8cd109b7655b3c39e7010898c6967976 100644 (file)
@@ -1074,9 +1074,8 @@ get_nr_build_jobs() {
 }
 
 maybe_reset_ci_container() {
-    # ceph-container includes ceph-mgr-cephadm by default, but nautilus does
-    # not ship this package
-    if [[ "$CI_CONTAINER" && "$BRANCH" =~ nautilus ]]; then
+    # we don't build containers for nautilus or older
+    if [[ "$CI_CONTAINER" && "$BRANCH" =~ luminous|nautilus ]]; then
         echo "disabling CI container build for $BRANCH"
         CI_CONTAINER=false
     fi