From 7455c25e51915b286930bab7bbe8c04490f61715 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 22 Jul 2022 14:36:54 -0600 Subject: [PATCH] docs/docker-compose: Tolerate empty TEUTH_BRANCH Signed-off-by: Zack Cerza --- docs/docker-compose/teuthology/teuthology.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/docker-compose/teuthology/teuthology.sh b/docs/docker-compose/teuthology/teuthology.sh index bb5890331..0378f93d4 100755 --- a/docs/docker-compose/teuthology/teuthology.sh +++ b/docs/docker-compose/teuthology/teuthology.sh @@ -16,8 +16,11 @@ else fi export MACHINE_TYPE=${MACHINE_TYPE:-testnode} if [ -z "$TEUTHOLOGY_WAIT" ]; then + if [ -n "$TEUTH_BRANCH" ]; then + TEUTH_BRANCH_FLAG="--teuthology-branch $TEUTH_BRANCH" + fi teuthology-suite -v \ - --teuthology-branch $TEUTH_BRANCH \ + $TEUTH_BRANCH_FLAG \ --ceph-repo https://github.com/ceph/ceph.git \ --suite-repo https://github.com/ceph/ceph.git \ -c main \ -- 2.47.3