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/tempest/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/tempest/Dockerfile')
| -rw-r--r-- | docker/tempest/Dockerfile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/docker/tempest/Dockerfile b/docker/tempest/Dockerfile index 7766f6c7f..1d46955fe 100644 --- a/docker/tempest/Dockerfile +++ b/docker/tempest/Dockerfile @@ -11,8 +11,9 @@ 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 && \ - pip install --no-cache-dir --src /src -cupper-constraints.txt \ - -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + wget -q -O- https://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH | \ + sed -E /#egg=functest/d > upper-constraints.opnfv.txt && \ + pip install --no-cache-dir --src /src -cupper-constraints.txt -cupper-constraints.opnfv.txt \ -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ git clone https://github.com/openstack/os-faults.git /src/os-faults && \ (cd /src/os-faults && git checkout $OS_FAULTS_TAG) && \ @@ -22,13 +23,11 @@ RUN apk --no-cache add --virtual .build-deps --update \ update-requirements -s --source /src/openstack-requirements /src/rally/ && \ git clone --depth 1 https://github.com/openstack/rally-openstack.git /src/rally-openstack && \ update-requirements -s --source /src/openstack-requirements /src/rally-openstack && \ - 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 \ tempest /src/rally-openstack /src/os-faults && \ - 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/rally && \ - rm -r upper-constraints.txt /src/os-faults /src/rally /src/rally-openstack && \ + rm -r upper-constraints.txt upper-constraints.opnfv.txt /src/os-faults /src/rally /src/rally-openstack && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally db create && \ |