diff options
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rwxr-xr-x | docker/prepare_env.sh | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 836598a08..49f71ba12 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -59,10 +59,9 @@ RUN git clone -b stable https://github.com/boucherv-orange/clearwater-live-test RUN pip install -r ${repos_dir}/functest/docker/requirements.pip -RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 +RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 RUN curl -L https://get.rvm.io | bash -s stable RUN bash -c 'source /etc/profile.d/rvm.sh ; rvm autolibs enable ; rvm install 1.9.3 ; rvm use 1.9.3' RUN bash -c 'source /etc/profile.d/rvm.sh ; cd ${repos_dir}/vims-test ; bundle install' -ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/ - +ADD http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img /home/opnfv/functest/data/
\ No newline at end of file diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh index 6c77e8140..493f2f88a 100755 --- a/docker/prepare_env.sh +++ b/docker/prepare_env.sh @@ -102,8 +102,16 @@ if [ $offline == false ]; then info "Updating Rally repository...." cd ${RALLY_REPO_DIR} + if [ ${RALLY_BRANCH} != "master" ]; then + info "Rally repo: checkout ${RALLY_BRANCH} branch..." + git checkout ${RALLY_BRANCH} + 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 info "Updating vIMS test repository...." cd ${VIMS_REPO_DIR} |