From: Zack Cerza <zack@redhat.com>
Date: Thu, 24 Mar 2022 23:09:59 +0000 (-0600)
Subject: start.sh: Copy config files more consistently
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8327485f83c8c5b9476bdbe25b0dfea968c2a076;p=teuthology.git

start.sh: Copy config files more consistently

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

diff --git a/docs/docker-compose/start.sh b/docs/docker-compose/start.sh
index 25ae832a91..22784dd147 100755
--- a/docs/docker-compose/start.sh
+++ b/docs/docker-compose/start.sh
@@ -8,21 +8,12 @@ git clone \
   -b ${TEUTHOLOGY_BRANCH:-$(git branch --show-current)} \
   https://github.com/ceph/teuthology.git
 
-# Check for .teuthology.yaml file and copy it to teuthology
-if [ -f ".teuthology.yaml" ]; 
-then
-    cp .teuthology.yaml teuthology/.
-else
-    echo ".teuthology.yaml doesn't exists"
-    exit 1
-fi
-
-# Copy Docker file into teuthology
-cp ./Dockerfile teuthology/.
+cp .teuthology.yaml teuthology/
+cp Dockerfile teuthology/
+cp teuthology.sh teuthology/
+cp custom_conf.yaml teuthology/
 
-cp ./teuthology.sh teuthology/
 
-cp ./custom_conf.yaml teuthology/
 
 # Generate an SSH keypair to use
 SSH_PRIVKEY_PATH=$(mktemp -u /tmp/teuthology-ssh-key-XXXXXX)