diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2018-03-20 00:39:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-20 00:39:24 +0000 |
| commit | 7caa49f07b45f24c22aeade51985bf8efbd6c222 (patch) | |
| tree | dd07dbcb9630108eb937bff60ce14a964d411cc3 | |
| parent | d601cde6a374d4e5b5138aab4cf4e156df5dbbc4 (diff) | |
| parent | 1e54a52f35d3476717b10f7e43deb0ff614bbae7 (diff) | |
Merge "mount a ubuntu 16.04 image into qtip container"
| -rw-r--r-- | tests/ci/compute/docker-compose.yaml | 1 | ||||
| -rw-r--r-- | tests/ci/utils/start_services.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/ci/compute/docker-compose.yaml b/tests/ci/compute/docker-compose.yaml index b6bdf13d..896908d1 100644 --- a/tests/ci/compute/docker-compose.yaml +++ b/tests/ci/compute/docker-compose.yaml @@ -16,3 +16,4 @@ services: env_file: ${ENV_FILE} volumes: - ${SSH_CREDENTIALS}:/root/.ssh + - ${IMAGE_DIR}:/tmp diff --git a/tests/ci/utils/start_services.sh b/tests/ci/utils/start_services.sh index c2129570..602a999e 100644 --- a/tests/ci/utils/start_services.sh +++ b/tests/ci/utils/start_services.sh @@ -19,6 +19,7 @@ OPNFV_RELEASE=${OPNFV_RELEASE:-} EOF export SSH_CREDENTIALS=${SSH_CREDENTIALS:-/root/.ssh} +export IMAGE_DIR=${IMAGE_DIR:-$HOME/tmp} TMPFILE=`mktemp /tmp/qtip.XXXXXX` || exit 1 curl https://git.opnfv.org/releng/plain/utils/fetch_os_creds.sh | bash -s -- \ |