From: Dan Mick <dmick@redhat.com>
Date: Sat, 2 Sep 2023 07:28:27 +0000 (-0700)
Subject: sepia-fog-images/build/build: bootstrap teuthology unconditionally
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2163%2Fhead;p=ceph-build.git

sepia-fog-images/build/build: bootstrap teuthology unconditionally

Whether or not we will teuthology-lock machines, we always need
teuthology-queue --pause

Signed-off-by: Dan Mick <dmick@redhat.com>
---

diff --git a/sepia-fog-images/build/build b/sepia-fog-images/build/build
index 92a0d68e..a4c844bb 100755
--- a/sepia-fog-images/build/build
+++ b/sepia-fog-images/build/build
@@ -70,18 +70,13 @@ else
   use_teuthologylock=false
 fi
 
-if [ "$use_teuthologylock" = true ]; then
-  # Bootstrap teuthology
-  ./bootstrap
-
-  cd $WORKSPACE
-
-  source $WORKSPACE/teuthology/virtualenv/bin/activate
-else
-  virtualenv $WORKSPACE/venv
-  source $WORKSPACE/venv/bin/activate
-  pip install $(grep -E 'ansible==' requirements.txt | awk '{ print $1 }')
-fi
+# once this bootstrap was conditional on use_teuthologylock,
+# but we also want teuthology-queue, even if we're not using
+# teuthology-lock
+# Bootstrap teuthology
+./bootstrap
+cd $WORKSPACE
+source $WORKSPACE/teuthology/virtualenv/bin/activate
 
 # Clone or update ceph-cm-ansible
 if [ ! -d ceph-cm-ansible ]; then