diff options
Diffstat (limited to 'docker/prepare_env.sh')
| -rwxr-xr-x | docker/prepare_env.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh index 493f2f88..454ba4e3 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -108,10 +108,7 @@ if [ $offline == false ]; then fi info "Rally repo: pulling to latest..." git pull - if [ ${RALLY_COMMIT} != "latest" ]; then - info "Rally repo: given commit is ${RALLY_COMMIT}. Reseting..." - git reset --hard ${RALLY_COMMIT} - fi + # We leave the reset command for later. info "Updating vIMS test repository...." cd ${VIMS_REPO_DIR} @@ -129,7 +126,9 @@ if [ $offline == false ]; then fi # We do this regardless if its online or offline mode. +# Assumption: the docker image contains a newer rally repo than the given commit. if [ ${RALLY_COMMIT} != "latest" ]; then + cd ${RALLY_REPO_DIR} info "Rally repo: given commit is ${RALLY_COMMIT}. Reseting..." git reset --hard ${RALLY_COMMIT} fi |