[PATCH] ci: Regenerate files

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
 ci/buildenv/centos-stream-9.sh                         |  5 +----
 .../{opensuse-leap-154.sh => opensuse-leap-15.sh}      |  0
 ci/containers/centos-stream-9.Dockerfile               |  6 +-----
 ...leap-154.Dockerfile => opensuse-leap-15.Dockerfile} |  0
 ci/gitlab/builds.yml                                   | 10 +++++-----
 ci/gitlab/containers.yml                               |  4 ++--
 ci/manifest.yml                                        |  2 +-
 7 files changed, 10 insertions(+), 17 deletions(-)
 rename ci/buildenv/{opensuse-leap-154.sh => opensuse-leap-15.sh} (100%)
 rename ci/containers/{opensuse-leap-154.Dockerfile => opensuse-leap-15.Dockerfile} (100%)

diff --git a/ci/buildenv/centos-stream-9.sh b/ci/buildenv/centos-stream-9.sh
index 79d74d9b2b..454e1f6322 100644
--- a/ci/buildenv/centos-stream-9.sh
+++ b/ci/buildenv/centos-stream-9.sh
@@ -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"
diff --git a/ci/buildenv/opensuse-leap-154.sh b/ci/buildenv/opensuse-leap-15.sh
similarity index 100%
rename from ci/buildenv/opensuse-leap-154.sh
rename to ci/buildenv/opensuse-leap-15.sh
diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile
index 6478031379..47e9008b72 100644
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@@ -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"
diff --git a/ci/containers/opensuse-leap-154.Dockerfile b/ci/containers/opensuse-leap-15.Dockerfile
similarity index 100%
rename from ci/containers/opensuse-leap-154.Dockerfile
rename to ci/containers/opensuse-leap-15.Dockerfile
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 545478d351..258d7a1da7 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -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
 
 
diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 150df26519..5a02843ed9 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -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:
diff --git a/ci/manifest.yml b/ci/manifest.yml
index b68c7361ab..82b8463605 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -160,7 +160,7 @@ targets:
 
   freebsd-13: x86_64
 
-  opensuse-leap-154:
+  opensuse-leap-15:
     jobs:
       - arch: x86_64
         variables:
-- 
2.39.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux