From c269434a6170abed575c8bd7f3e4badbaf086df8 Mon Sep 17 00:00:00 2001 From: beierlm Date: Sat, 28 Nov 2020 09:30:51 -0500 Subject: [PATCH] Fix build dependencies Forces tox recreate to expose missing dependencies. Adds wget to dockerfile for make IM to complete. Change-Id: Ic01c91c06123c76989b96002b07788117e6f67e4 Signed-off-by: beierlm --- Dockerfile | 2 +- devops-stages/stage-build.sh | 2 +- devops-stages/stage-test.sh | 2 +- tox.ini | 8 -------- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index ef0175a..8c16461 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,4 +16,4 @@ FROM ubuntu:18.04 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install git \ make python3 python3-pip libcurl4-openssl-dev libssl-dev tox python3-dev \ debhelper python3-setuptools python3-all python-all python-pip \ - apt-utils + apt-utils wget diff --git a/devops-stages/stage-build.sh b/devops-stages/stage-build.sh index 7b00243..f00cd3e 100755 --- a/devops-stages/stage-build.sh +++ b/devops-stages/stage-build.sh @@ -14,4 +14,4 @@ # limitations under the License. rm -rf deb_dist osmclient-*.tar.gz -tox -e build,build3 +tox -e build diff --git a/devops-stages/stage-test.sh b/devops-stages/stage-test.sh index d40e29e..0177ba3 100755 --- a/devops-stages/stage-test.sh +++ b/devops-stages/stage-test.sh @@ -11,5 +11,5 @@ # implied. # See the License for the specific language governing permissions and # limitations under the License. -tox +tox --recreate diff --git a/tox.ini b/tox.ini index b02cab2..608dc8d 100644 --- a/tox.ini +++ b/tox.ini @@ -36,14 +36,6 @@ commands = pyflakes osmclient [testenv:build] -basepython = python -deps = stdeb - setuptools-version-command - -r{toxinidir}/requirements.txt -install_command = python2 -m pip install -U {opts} {packages} -commands = python2 setup.py --command-packages=stdeb.command bdist_deb - -[testenv:build3] basepython = python3 deps = stdeb setuptools-version-command -- 2.25.1