From 16a669689107956a9e9b3924b2478b074b44fc90 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 14 Jun 2020 12:51:22 +0200 Subject: Clone repositories instead of wgetting constraints MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It stops leveraging on wget to get constraints as it fails since opendev was created. Then functest and requirements are no longer removed for functest-core which simplifies all child Dockerfile. It also fix the current incompatibilities in OpenStack constraints ERROR: cliff 3.2.0 has requirement cmd2!=0.8.3,<0.9.0,>=0.8.0, but you'll have cmd2 1.1.0 which is incompatible. https://github.com/openstack/requirements/blob/master/upper-constraints.txt#L230 https://github.com/openstack/requirements/blob/master/upper-constraints.txt#L416 Change-Id: I7c044208ef26ad047fb841710b422acb6c9f0320 Signed-off-by: Cédric Ollivier (cherry picked from commit 961b940c796871e40146b90cf19b48390310dd59) --- docker/smoke-cntt/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/smoke-cntt') diff --git a/docker/smoke-cntt/Dockerfile b/docker/smoke-cntt/Dockerfile index ad3177acc..458462e40 100644 --- a/docker/smoke-cntt/Dockerfile +++ b/docker/smoke-cntt/Dockerfile @@ -1,5 +1,5 @@ FROM opnfv/functest-smoke:jerma COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml -COPY tempest_conf.yaml /usr/lib/python3.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml +COPY tempest_conf.yaml /src/functest/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml CMD ["run_tests", "-t", "all"] -- cgit 1.2.3-korg