diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-19 14:36:46 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-06-19 17:03:26 +0200 |
| commit | 7cdab4c61f09db66dc0c0a157d90e8ef56bcfa5b (patch) | |
| tree | a32738075be8d7112e0a647f71a952ca83c7a39d /docker/smoke/Dockerfile | |
| parent | 019cd1506aba1dfe2c73e7ddeb5de8f4af6d4cd9 (diff) | |
Add functest in upper-constraints
It's required by OPNFV Features such as sfc.
Functest is removed from constraints in Dockerfile else it would
conflict with the local dir.
Change-Id: I2df5cd151b43eb1a4f0320510183d0f28cdf84c3
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'docker/smoke/Dockerfile')
| -rw-r--r-- | docker/smoke/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index c778772e6..e8a6b5d55 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -13,18 +13,19 @@ RUN apk --no-cache add --virtual .build-deps --update \ wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ > upper-constraints.txt && \ + wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \ + sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \ git clone https://github.com/openstack/patrole.git /src/patrole && \ (cd /src/patrole && git checkout $PATROLE_TAG) && \ update-requirements -s --source /src/openstack-requirements /src/patrole/ && \ git clone --depth 1 https://github.com/openstack/neutron-tempest-plugin.git /src/neutron-tempest-plugin && \ update-requirements -s --source /src/openstack-requirements /src/neutron-tempest-plugin && \ - pip install --no-cache-dir --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ /src/patrole /src/neutron-tempest-plugin -rthirdparty-requirements.txt && \ git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \ (cd /src/odl_test && git checkout $ODL_TAG) && \ virtualenv --system-site-packages /src/tempest/.venv && \ - rm -r upper-constraints.txt thirdparty-requirements.txt /src/odl_test/.git \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt thirdparty-requirements.txt /src/odl_test/.git \ /src/patrole /src/neutron-tempest-plugin && \ mkdir -p /home/opnfv/functest/data/refstack && \ wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \ |