From 27d22a984df4bf1e201a62c1b260bdb9cf01b712 Mon Sep 17 00:00:00 2001 From: "zhu.boxiang" Date: Mon, 22 Nov 2021 14:32:42 +0800 Subject: [PATCH] fix: Error build image Fail to build skyline image. We should upgrade the pip and setuptools version. Remove irrelevant files for skyline-tox-lint-py38 job to retain one job to trigger zuul. Refer: https://github.com/python-poetry/poetry/issues/3329 Change-Id: I444faa3aefaa8ef8cfeb5284bc2a7a49bb0cb91b --- .zuul.yaml | 22 ++-------------------- container/Dockerfile | 1 + 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 48a9de4..a0806eb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -66,16 +66,7 @@ - ^.*\.md$ - ^libs/skyline-console$ - ^kolla/.*$ - - skyline-tox-lint-py38: - irrelevant-files: - - ^container/.*$ - - ^devstack/.*$ - - ^docs/.*$ - - ^tools/.*$ - - ^.*\.rst$ - - ^.*\.md$ - - ^libs/skyline-console$ - - ^kolla/.*$ + - skyline-tox-lint-py38 - skyline-functional-devstack: irrelevant-files: - ^container/.*$ @@ -96,16 +87,7 @@ - ^.*\.md$ - ^libs/skyline-console$ - ^kolla/.*$ - - skyline-tox-lint-py38: - irrelevant-files: - - ^container/.*$ - - ^devstack/.*$ - - ^docs/.*$ - - ^tools/.*$ - - ^.*\.rst$ - - ^.*\.md$ - - ^libs/skyline-console$ - - ^kolla/.*$ + - skyline-tox-lint-py38 - skyline-functional-devstack: irrelevant-files: - ^container/.*$ diff --git a/container/Dockerfile b/container/Dockerfile index 6e88b0f..82f08bf 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -37,6 +37,7 @@ RUN export LANG=C.UTF-8 \ && rm -rf /usr/bin/python /usr/bin/pip \ && ln -s /usr/bin/python3 /usr/bin/python \ && ln -s /usr/bin/pip3 /usr/bin/pip \ + && pip install -U pip setuptools'<58.0.0' \ && pip install poetry!=1.1.8 \ && poetry config virtualenvs.create false \ && mkdir -p /etc/skyline /var/log/skyline/ /var/lib/skyline \