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
This commit is contained in:
zhu.boxiang 2021-11-22 14:32:42 +08:00
parent 2fa6e6bd39
commit 27d22a984d
2 changed files with 3 additions and 20 deletions

View File

@ -66,16 +66,7 @@
- ^.*\.md$ - ^.*\.md$
- ^libs/skyline-console$ - ^libs/skyline-console$
- ^kolla/.*$ - ^kolla/.*$
- skyline-tox-lint-py38: - skyline-tox-lint-py38
irrelevant-files:
- ^container/.*$
- ^devstack/.*$
- ^docs/.*$
- ^tools/.*$
- ^.*\.rst$
- ^.*\.md$
- ^libs/skyline-console$
- ^kolla/.*$
- skyline-functional-devstack: - skyline-functional-devstack:
irrelevant-files: irrelevant-files:
- ^container/.*$ - ^container/.*$
@ -96,16 +87,7 @@
- ^.*\.md$ - ^.*\.md$
- ^libs/skyline-console$ - ^libs/skyline-console$
- ^kolla/.*$ - ^kolla/.*$
- skyline-tox-lint-py38: - skyline-tox-lint-py38
irrelevant-files:
- ^container/.*$
- ^devstack/.*$
- ^docs/.*$
- ^tools/.*$
- ^.*\.rst$
- ^.*\.md$
- ^libs/skyline-console$
- ^kolla/.*$
- skyline-functional-devstack: - skyline-functional-devstack:
irrelevant-files: irrelevant-files:
- ^container/.*$ - ^container/.*$

View File

@ -37,6 +37,7 @@ RUN export LANG=C.UTF-8 \
&& rm -rf /usr/bin/python /usr/bin/pip \ && rm -rf /usr/bin/python /usr/bin/pip \
&& ln -s /usr/bin/python3 /usr/bin/python \ && ln -s /usr/bin/python3 /usr/bin/python \
&& ln -s /usr/bin/pip3 /usr/bin/pip \ && ln -s /usr/bin/pip3 /usr/bin/pip \
&& pip install -U pip setuptools'<58.0.0' \
&& pip install poetry!=1.1.8 \ && pip install poetry!=1.1.8 \
&& poetry config virtualenvs.create false \ && poetry config virtualenvs.create false \
&& mkdir -p /etc/skyline /var/log/skyline/ /var/lib/skyline \ && mkdir -p /etc/skyline /var/log/skyline/ /var/lib/skyline \