diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/exec_tests.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index a1b88fe69..248a6ab05 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -73,7 +73,7 @@ RUN ${YARDSTICK_REPO_DIR}/api/api-prepare.sh EXPOSE 5000 -ADD http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img /home/opnfv/images/ +ADD http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img /home/opnfv/images/ ADD http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img /home/opnfv/images/ COPY ./exec_tests.sh /usr/local/bin/ diff --git a/docker/exec_tests.sh b/docker/exec_tests.sh index 5e0d30453..db053f7bc 100755 --- a/docker/exec_tests.sh +++ b/docker/exec_tests.sh @@ -22,7 +22,7 @@ git_checkout() { if git cat-file -e $1^{commit} 2>/dev/null; then # branch, tag or sha1 object - git checkout $1 + git checkout $1 && git pull else # refspec / changeset git fetch --tags --progress $2 $1 @@ -45,7 +45,6 @@ if [ ! -d $YARDSTICK_REPO_DIR ]; then git clone $YARDSTICK_REPO $YARDSTICK_REPO_DIR fi cd $YARDSTICK_REPO_DIR -git checkout master git_checkout $YARDSTICK_BRANCH $YARDSTICK_REPO # setup the environment |