diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-09-07 12:20:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-07 12:20:19 +0000 |
| commit | 5605ff36c726d49cce33c6ca0f68f802645913bf (patch) | |
| tree | 04e5bc006df42e1cdf4d70b425a0f7fd479bf234 /docker | |
| parent | fb7b815a1e8945512d41c3c886d5ad229da79f09 (diff) | |
| parent | 30c4078fd1c07e9f78d1c26f5e1b51bc9f553c09 (diff) | |
Merge "Use git commit id for ODL"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 29439f8e..603bc38b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container" # Environment variables ARG BRANCH=master ARG RALLY_TAG=stable/0.9 -ARG ODL_TAG=release/carbon +ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940 ARG OPENSTACK_TAG=stable/ocata ARG VIMS_TAG=stable ARG REPOS_DIR=/home/opnfv/repos @@ -99,7 +99,8 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/fds /src/fds # other repositories -RUN git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test +RUN git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ + (cd src/odl_test && git checkout -b $ODL_TAG) RUN git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test # Install tempest venv and create symlink for running refstack-client diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 26a47380..3b1e8d2e 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -2,7 +2,7 @@ FROM opnfv/functest-core ARG BRANCH=master ARG OPENSTACK_TAG=stable/ocata -ARG ODL_TAG=release/carbon +ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940 ARG FDS_TAG=master COPY thirdparty-requirements.txt thirdparty-requirements.txt @@ -19,7 +19,8 @@ RUN apk --no-cache add --virtual .build-deps --update \ -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -rthirdparty-requirements.txt && \ - git clone --depth 1 -b $ODL_TAG https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ + git clone --depth 1 https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ + (cd src/odl_test && git checkout -b $ODL_TAG) && \ git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \ ln -s /src/tempest /src/refstack-client/.tempest && \ virtualenv --system-site-packages /src/tempest/.venv && \ |