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 601ffd2f37dca92f78aa73337eba57ef0ba86477..4276fc456c3f4011d3d8f9db63465768cac159c6 100644 (file)
--- 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 65c327e4a9c8cebf52d18178fc3217d7c840ace5..b5baec7370b5a3b7f8719eaed92872136d538f66 100755 (executable)
--- 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 050f2893edb908737ddcc23cc6801f115acd03e9..b4e6c9224e905ad32f973d9664addebbd22ed5b9 100755 (executable)
--- 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 \