From 7a68ddaa321befab749b9df215192efb478c992f Mon Sep 17 00:00:00 2001
From: David Galloway <dgallowa@redhat.com>
Date: Fri, 10 Jul 2020 13:53:13 -0400
Subject: [PATCH] build_utils.sh: Don't build containers for luminous either

Signed-off-by: David Galloway <dgallowa@redhat.com>
---
 scripts/build_utils.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index e13af3fc..2311a56c 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -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
-- 
2.39.5