diff options
Diffstat (limited to 'docker/smoke')
| -rw-r--r-- | docker/smoke/Dockerfile | 11 | ||||
| -rw-r--r-- | docker/smoke/upper-constraints.txt | 17 |
2 files changed, 7 insertions, 21 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 5a3b59be6..b037728ae 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,15 +1,18 @@ FROM ollivier/functest-core +ARG BRANCH=master +ARG OPENSTACK_TAG=stable/ocata + COPY thirdparty-requirements.txt thirdparty-requirements.txt -COPY upper-constraints.txt upper-constraints.txt RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev git && \ - pip install --src /src -cupper-constraints.txt \ - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata \ + pip install --src /src \ + -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 && \ ln -s /src/tempest /src/refstack-client/.tempest && \ virtualenv --system-site-packages /src/tempest/.venv && \ - rm thirdparty-requirements.txt upper-constraints.txt && \ + rm thirdparty-requirements.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml diff --git a/docker/smoke/upper-constraints.txt b/docker/smoke/upper-constraints.txt deleted file mode 100644 index 73ec7f41b..000000000 --- a/docker/smoke/upper-constraints.txt +++ /dev/null @@ -1,17 +0,0 @@ -git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules -git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps -git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests -git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn -git+https://gerrit.opnfv.org/gerrit/opera#egg=opera -git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning -git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc --e git+https://github.com/openstack/refstack-client#egg=refstack-client -cloudify_rest_client===4.0 -iniparse===0.4 -openbaton-cli===2.2.1b7 -robotframework===3.0.2 -robotframework-httplibrary===0.4.2 -robotframework-requests===0.4.7 -robotframework-sshlibrary===2.1.3;python_version=='2.7' -kingbird===1.1.0 -rally===0.9.1 |