From 19c8d28a3870a7cce9b238627ce3b3c2a43f9ff2 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Sat, 2 Sep 2023 00:28:27 -0700 Subject: [PATCH] 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 --- sepia-fog-images/build/build | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) 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 -- 2.39.5