ci: Regenerate files

This removes minor version number from OpenSUSE LEAP target names
and on CentOS Stream 9 installs flake8 from repositories, instead
of pip.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik 2023-04-27 08:48:21 +02:00
parent 567f1ece98
commit a3cc0e9ceb
7 changed files with 10 additions and 17 deletions

View File

@ -68,9 +68,7 @@ function install_buildenv() {
polkit \
python3 \
python3-docutils \
python3-pip \
python3-setuptools \
python3-wheel \
python3-flake8 \
qemu-img \
readline-devel \
rpcgen \
@ -88,7 +86,6 @@ function install_buildenv() {
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
/usr/bin/pip3 install flake8
}
export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"

View File

@ -69,9 +69,7 @@ RUN dnf distro-sync -y && \
polkit \
python3 \
python3-docutils \
python3-pip \
python3-setuptools \
python3-wheel \
python3-flake8 \
qemu-img \
readline-devel \
rpcgen \
@ -92,8 +90,6 @@ RUN dnf distro-sync -y && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
RUN /usr/bin/pip3 install flake8
ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"

View File

@ -285,23 +285,23 @@ x86_64-fedora-rawhide-clang-local-env:
RPM: skip
x86_64-opensuse-leap-154-prebuilt-env:
x86_64-opensuse-leap-15-prebuilt-env:
extends: .native_build_job_prebuilt_env
needs:
- job: x86_64-opensuse-leap-154-container
- job: x86_64-opensuse-leap-15-container
optional: true
allow_failure: false
variables:
NAME: opensuse-leap-154
NAME: opensuse-leap-15
RPM: skip
x86_64-opensuse-leap-154-local-env:
x86_64-opensuse-leap-15-local-env:
extends: .native_build_job_local_env
needs: []
allow_failure: false
variables:
IMAGE: registry.opensuse.org/opensuse/leap:15.4
NAME: opensuse-leap-154
NAME: opensuse-leap-15
RPM: skip

View File

@ -77,11 +77,11 @@ x86_64-fedora-rawhide-container:
NAME: fedora-rawhide
x86_64-opensuse-leap-154-container:
x86_64-opensuse-leap-15-container:
extends: .container_job
allow_failure: false
variables:
NAME: opensuse-leap-154
NAME: opensuse-leap-15
x86_64-opensuse-tumbleweed-container:

View File

@ -160,7 +160,7 @@ targets:
freebsd-13: x86_64
opensuse-leap-154:
opensuse-leap-15:
jobs:
- arch: x86_64
variables: