From 7334972c9ad2a85e1f85ccd32934fc16ac67163b Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 23 Mar 2023 09:54:03 +0100 Subject: [PATCH] ci: Drop EOL OpenSUSE 15.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The '15.3' version is EOL now: https://get.opensuse.org/leap/15.3/ Also switch the 'codestyle' job to the appropriate container image. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik Reviewed-by: Ján Tomko --- .gitlab-ci.yml | 8 +- ci/buildenv/opensuse-leap-153.sh | 99 -------------------- ci/containers/opensuse-leap-153.Dockerfile | 101 --------------------- ci/gitlab/builds.yml | 20 ---- ci/gitlab/containers.yml | 7 -- ci/manifest.yml | 6 -- 6 files changed, 4 insertions(+), 237 deletions(-) delete mode 100644 ci/buildenv/opensuse-leap-153.sh delete mode 100644 ci/containers/opensuse-leap-153.Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b72ebc493..8bf6e5c6b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,18 +118,18 @@ codestyle_prebuilt_env: - .codestyle_job - .gitlab_native_build_job_prebuilt_env needs: - - job: x86_64-opensuse-leap-153-container + - job: x86_64-opensuse-leap-154-container optional: true variables: - NAME: opensuse-leap-153 + NAME: opensuse-leap-154 codestyle_local_env: extends: - .codestyle_job - .gitlab_native_build_job_local_env variables: - IMAGE: registry.opensuse.org/opensuse/leap:15.3 - NAME: opensuse-leap-153 + IMAGE: registry.opensuse.org/opensuse/leap:15.4 + NAME: opensuse-leap-154 # This artifact published by this job is downloaded to push to Weblate diff --git a/ci/buildenv/opensuse-leap-153.sh b/ci/buildenv/opensuse-leap-153.sh deleted file mode 100644 index b78382470c..0000000000 --- a/ci/buildenv/opensuse-leap-153.sh +++ /dev/null @@ -1,99 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - zypper update -y - zypper install -y \ - audit-devel \ - augeas \ - augeas-lenses \ - bash-completion \ - ca-certificates \ - ccache \ - clang \ - codespell \ - cpp \ - cppi \ - cyrus-sasl-devel \ - device-mapper-devel \ - diffutils \ - dwarves \ - ebtables \ - fuse-devel \ - gcc \ - gettext-runtime \ - git \ - glib2-devel \ - glibc-devel \ - glibc-locale \ - glusterfs-devel \ - grep \ - iproute2 \ - iptables \ - kmod \ - libacl-devel \ - libapparmor-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libgnutls-devel \ - libiscsi-devel \ - libnl3-devel \ - libnuma-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libudev-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - libyajl-devel \ - lvm2 \ - make \ - nfs-utils \ - ninja \ - numad \ - open-iscsi \ - parted-devel \ - perl-base \ - pkgconfig \ - polkit \ - python3-base \ - python3-docutils \ - python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-tools \ - readline-devel \ - rpcgen \ - rpm-build \ - sanlock-devel \ - scrub \ - sed \ - systemd-rpm-macros \ - systemtap-sdt-devel \ - wireshark-devel \ - xen-devel - rpm -qa | sort > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - 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 meson==0.56.0 -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" diff --git a/ci/containers/opensuse-leap-153.Dockerfile b/ci/containers/opensuse-leap-153.Dockerfile deleted file mode 100644 index 49e0c98c8a..0000000000 --- a/ci/containers/opensuse-leap-153.Dockerfile +++ /dev/null @@ -1,101 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM registry.opensuse.org/opensuse/leap:15.3 - -RUN zypper update -y && \ - zypper install -y \ - audit-devel \ - augeas \ - augeas-lenses \ - bash-completion \ - ca-certificates \ - ccache \ - clang \ - codespell \ - cpp \ - cppi \ - cyrus-sasl-devel \ - device-mapper-devel \ - diffutils \ - dwarves \ - ebtables \ - fuse-devel \ - gcc \ - gettext-runtime \ - git \ - glib2-devel \ - glibc-devel \ - glibc-locale \ - glusterfs-devel \ - grep \ - iproute2 \ - iptables \ - kmod \ - libacl-devel \ - libapparmor-devel \ - libattr-devel \ - libblkid-devel \ - libcap-ng-devel \ - libcurl-devel \ - libgnutls-devel \ - libiscsi-devel \ - libnl3-devel \ - libnuma-devel \ - libpcap-devel \ - libpciaccess-devel \ - librbd-devel \ - libselinux-devel \ - libssh-devel \ - libssh2-devel \ - libtirpc-devel \ - libudev-devel \ - libwsman-devel \ - libxml2 \ - libxml2-devel \ - libxslt \ - libyajl-devel \ - lvm2 \ - make \ - nfs-utils \ - ninja \ - numad \ - open-iscsi \ - parted-devel \ - perl-base \ - pkgconfig \ - polkit \ - python3-base \ - python3-docutils \ - python3-flake8 \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-tools \ - readline-devel \ - rpcgen \ - rpm-build \ - sanlock-devel \ - scrub \ - sed \ - systemd-rpm-macros \ - systemtap-sdt-devel \ - wireshark-devel \ - xen-devel && \ - zypper clean --all && \ - rpm -qa | sort > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - 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 - -RUN /usr/bin/pip3 install meson==0.56.0 - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 0f60ba89ce..d982824b65 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -285,26 +285,6 @@ x86_64-fedora-rawhide-clang-local-env: RPM: skip -x86_64-opensuse-leap-153-prebuilt-env: - extends: .native_build_job_prebuilt_env - needs: - - job: x86_64-opensuse-leap-153-container - optional: true - allow_failure: false - variables: - NAME: opensuse-leap-153 - RPM: skip - -x86_64-opensuse-leap-153-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: registry.opensuse.org/opensuse/leap:15.3 - NAME: opensuse-leap-153 - RPM: skip - - x86_64-opensuse-leap-154-prebuilt-env: extends: .native_build_job_prebuilt_env needs: diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 241475b5e3..150df26519 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -77,13 +77,6 @@ x86_64-fedora-rawhide-container: NAME: fedora-rawhide -x86_64-opensuse-leap-153-container: - extends: .container_job - allow_failure: false - variables: - NAME: opensuse-leap-153 - - x86_64-opensuse-leap-154-container: extends: .container_job allow_failure: false diff --git a/ci/manifest.yml b/ci/manifest.yml index 3270be85fe..b68c7361ab 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -160,12 +160,6 @@ targets: freebsd-13: x86_64 - opensuse-leap-153: - jobs: - - arch: x86_64 - variables: - RPM: skip - opensuse-leap-154: jobs: - arch: x86_64