]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-build.git/commitdiff
sepia-fog-images/build/build: bootstrap teuthology unconditionally 2163/head
authorDan Mick <dmick@redhat.com>
Sat, 2 Sep 2023 07:28:27 +0000 (00:28 -0700)
committerDan Mick <dmick@redhat.com>
Sat, 2 Sep 2023 07:28:27 +0000 (00:28 -0700)
Whether or not we will teuthology-lock machines, we always need
teuthology-queue --pause

Signed-off-by: Dan Mick <dmick@redhat.com>
sepia-fog-images/build/build

index 92a0d68e4b39ba9fe37c776243034d890a65b837..a4c844bb66b1ede1e549605558787e33e984b852 100755 (executable)
@@ -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