diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | docker/exec_tests.sh | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index afb2ce5c6..a1b88fe69 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -21,7 +21,9 @@ ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick ENV RELENG_REPO_DIR ${REPOS_DIR}/releng RUN sed -i -e 's/^deb /deb [arch=amd64] /g' /etc/apt/sources.list RUN sed -i -e 's/^deb-src /# deb-src /g' /etc/apt/sources.list +RUN echo "APT::Default-Release \"trusty\";" > /etc/apt/apt.conf.d/default-distro RUN echo "\n\ +deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ xenial-updates universe \n\ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty main universe multiverse restricted \n\ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main universe multiverse restricted \n\ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty-security main universe multiverse restricted \n\ @@ -30,7 +32,7 @@ RUN echo "vm.mmap_min_addr = 0" > /etc/sysctl.d/mmap_min_addr.conf RUN dpkg --add-architecture arm64 RUN apt-get update && apt-get install -y \ - qemu-user-static \ + qemu-user-static/xenial \ libc6:arm64 \ wget \ expect \ diff --git a/docker/exec_tests.sh b/docker/exec_tests.sh index 9aee240da..5e0d30453 100755 --- a/docker/exec_tests.sh +++ b/docker/exec_tests.sh @@ -36,7 +36,7 @@ if [ ! -d $RELENG_REPO_DIR ]; then git clone $RELENG_REPO $RELENG_REPO_DIR fi cd $RELENG_REPO_DIR -git checkout master && git pull +git checkout master git_checkout $RELENG_BRANCH $RELENG_REPO echo @@ -45,7 +45,7 @@ if [ ! -d $YARDSTICK_REPO_DIR ]; then git clone $YARDSTICK_REPO $YARDSTICK_REPO_DIR fi cd $YARDSTICK_REPO_DIR -git checkout master && git pull +git checkout master git_checkout $YARDSTICK_BRANCH $YARDSTICK_REPO # setup the environment |