From e746e9c5237bf90f38b97b0717866425d78c6c26 Mon Sep 17 00:00:00 2001 From: Hedingber Date: Mon, 4 Oct 2021 02:01:23 +0300 Subject: [PATCH] [System Tests] Add API requirements (#1383) --- .github/workflows/system-tests-opensource.yml | 4 +++- dockerfiles/test-system/Dockerfile | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/system-tests-opensource.yml b/.github/workflows/system-tests-opensource.yml index 80a524f89e7..c101630ffdc 100644 --- a/.github/workflows/system-tests-opensource.yml +++ b/.github/workflows/system-tests-opensource.yml @@ -54,7 +54,9 @@ jobs: with: python-version: 3.7 - name: Install automation scripts dependencies and add mlrun to dev packages - run: pip install -r automation/requirements.txt -r dockerfiles/test-system/requirements.txt && pip install -e . + run: | + pip install -r automation/requirements.txt -r dockerfiles/test-system/requirements.txt \ + -r dockerfiles/api/requirements.txt && pip install -e . # TODO: How can we avoid these duplicate lines from the enterprise system tests, up until line 120. - name: Install curl and jq diff --git a/dockerfiles/test-system/Dockerfile b/dockerfiles/test-system/Dockerfile index 0d5be44611b..9e08f36a5fe 100644 --- a/dockerfiles/test-system/Dockerfile +++ b/dockerfiles/test-system/Dockerfile @@ -26,11 +26,19 @@ RUN apt-get update && apt-get install --no-install-recommends -y \ RUN python -m pip install --upgrade pip~=20.2.0 -COPY ./dockerfiles/test-system/requirements.txt /tmp/test-system-requirements.txt -COPY ./extras-requirements.txt /tmp -COPY ./requirements.txt /tmp -RUN python -m pip install -r /tmp/requirements.txt -r /tmp/extras-requirements.txt -r /tmp/test-system-requirements.txt && rm -f /tmp/*requirements.txt +COPY ./dockerfiles/test-system/requirements.txt /tmp/mlrun-requirements/test-system-requirements.txt +COPY ./dockerfiles/mlrun-api/requirements.txt /tmp/mlrun-requirements/mlrun-api-requirements.txt +COPY ./extras-requirements.txt /tmp/mlrun-requirements +COPY ./requirements.txt /tmp/mlrun-requirements +RUN python -m pip install \ + -r /tmp/mlrun-requirements/requirements.txt \ + -r /tmp/mlrun-requirements/extras-requirements.txt \ + -r /tmp/mlrun-requirements/mlrun-api-requirements.txt \ + -r /tmp/mlrun-requirements/test-system-requirements.txt COPY . /tmp/mlrun -RUN cd /tmp/mlrun && python -m pip install ".[complete]" && mv tests /tests && mv Makefile /Makefile && cd /tmp && rm -rf mlrun +RUN cd /tmp/mlrun && python -m pip install ".[complete]" && mv tests /tests && mv Makefile /Makefile + +# Clean up all code used for building to simulate user env +RUN rm -rf /tmp/mlrun-requirements && rm -rf /tmp/mlrun CMD ["make", "test-system"]