From: Zack Cerza <zack@redhat.com>
Date: Wed, 20 Apr 2022 22:54:26 +0000 (-0600)
Subject: docker-compose: Move TEUTH_BRANCH definition
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=89c5742616fac73331b44a8ef3e89960b16397e7;p=teuthology.git

docker-compose: Move TEUTH_BRANCH definition

So that we can access it from within the teuthology container.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/docs/docker-compose/docker-compose.yml b/docs/docker-compose/docker-compose.yml
index 601ffd2f3..4276fc456 100644
--- a/docs/docker-compose/docker-compose.yml
+++ b/docs/docker-compose/docker-compose.yml
@@ -73,6 +73,7 @@ services:
       MACHINE_TYPE:
       TESTNODES:
       TEUTHOLOGY_WAIT:
+      TEUTH_BRANCH:
   testnode:
     build:
       context: ./testnode
diff --git a/docs/docker-compose/start.sh b/docs/docker-compose/start.sh
index 65c327e4a..b5baec737 100755
--- a/docs/docker-compose/start.sh
+++ b/docs/docker-compose/start.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 set -e
+export TEUTHOLOGY_BRANCH=${TEUTHOLOGY_BRANCH:-$(git branch --show-current)}
+export TEUTH_BRANCH=${TEUTHOLOGY_BRANCH}
 if [ -n "$ANSIBLE_INVENTORY_REPO" ]; then
     basename=$(basename $ANSIBLE_INVENTORY_REPO | cut -d. -f1)
     if [ ! -d "$basename" ]; then
diff --git a/docs/docker-compose/teuthology/teuthology.sh b/docs/docker-compose/teuthology/teuthology.sh
index 050f2893e..b4e6c9224 100755
--- a/docs/docker-compose/teuthology/teuthology.sh
+++ b/docs/docker-compose/teuthology/teuthology.sh
@@ -5,8 +5,6 @@ if [ -n "$SSH_PRIVKEY_FILE" ]; then
 fi
 source /teuthology/virtualenv/bin/activate
 set -x
-cd /teuthology
-export TEUTHOLOGY_BRANCH=${TEUTHOLOGY_BRANCH:-$(git branch --show-current)}
 if [ -n "$TESTNODES" ]; then
     for node in $(echo $TESTNODES | tr , ' '); do
         teuthology-update-inventory -m $MACHINE_TYPE $node
@@ -18,7 +16,7 @@ fi
 export MACHINE_TYPE=${MACHINE_TYPE:-testnode}
 if [ -z "$TEUTHOLOGY_WAIT" ]; then
     teuthology-suite -v \
-        --teuthology-branch $TEUTHOLOGY_BRANCH \
+        --teuthology-branch $TEUTH_BRANCH \
         --ceph-repo https://github.com/ceph/ceph.git \
         --suite-repo https://github.com/ceph/ceph.git \
         -c master \