From 48008490a86070ec39ca3c592ff0551dddb4bfc4 Mon Sep 17 00:00:00 2001 From: Yang Jiao Date: Fri, 25 Mar 2022 05:07:07 +0000 Subject: [PATCH] Add python-dateutil module in api e2e image Because swagger_client adds dependency on python-dateutil module Signed-off-by: Yang Jiao --- tests/ci/api_run.sh | 2 +- tests/test-engine-image/Dockerfile.api_test | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/ci/api_run.sh b/tests/ci/api_run.sh index 2e8f4b174..a1d275769 100755 --- a/tests/ci/api_run.sh +++ b/tests/ci/api_run.sh @@ -18,7 +18,7 @@ harbor_logs_bucket="harbor-ci-logs" #echo "content_language = en" >> $botofile #echo "default_project_id = $GS_PROJECT_ID" >> $botofile DIR="$(cd "$(dirname "$0")" && pwd)" -E2E_IMAGE="goharbor/harbor-e2e-engine:3.0.0-api" +E2E_IMAGE="goharbor/harbor-e2e-engine:3.0.1-api" # GS util function uploader { diff --git a/tests/test-engine-image/Dockerfile.api_test b/tests/test-engine-image/Dockerfile.api_test index 39580123e..d78ef35b6 100644 --- a/tests/test-engine-image/Dockerfile.api_test +++ b/tests/test-engine-image/Dockerfile.api_test @@ -5,6 +5,8 @@ ENV LANG C.UTF-8 COPY --from=tool_builder /tool/tools.tar.gz /usr/local/bin +COPY --from=tool_builder /usr/local/etc/singularity/singularity.conf /usr/local/etc/singularity/singularity.conf + RUN tdnf install -y \ wget \ git \ @@ -20,7 +22,7 @@ RUN tdnf install -y \ gzip && \ tdnf erase -y toybox && \ tdnf install -y python3 python3-pip python3-setuptools httpd && \ - pip3 install --upgrade pip pyasn1 google-apitools==0.5.31 gsutil \ + pip3 install --upgrade pip pyasn1 google-apitools==0.5.31 gsutil python-dateutil \ robotframework==3.2.1 robotframework-sshlibrary robotframework-httplibrary \ requests dbbot robotframework-seleniumlibrary==4.3.0 robotframework-pabot \ robotframework-JSONLibrary hurry.filesize --upgrade && \