Leap 15.1 will reach EOL on January 31st 2021, so we should not test on
it during the current development cycle ending in March 1st.
Signed-off-by: Erik Skultety <eskultet@xxxxxxxxxx>
---
.gitlab-ci.yml | 17 +---
ci/containers/ci-opensuse-151.Dockerfile | 100 -----------------------
2 files changed, 2 insertions(+), 115 deletions(-)
delete mode 100644 ci/containers/ci-opensuse-151.Dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 995ccc8ead..8949adf7a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -172,11 +172,6 @@ x64-fedora-rawhide-container:
variables:
NAME: fedora-rawhide
-x64-opensuse-151-container:
- extends: .container_job
- variables:
- NAME: opensuse-151
-
x64-opensuse-152-container:
extends: .container_job
variables:
@@ -382,14 +377,6 @@ x64-fedora-rawhide-clang:
CC: clang
RPM: skip
-x64-opensuse-151:
- extends: .native_build_job
- needs:
- - x64-opensuse-151-container
- variables:
- NAME: opensuse-151
- RPM: skip
-
x64-opensuse-152:
extends: .native_build_job
needs:
@@ -558,9 +545,9 @@ website:
codestyle:
stage: builds
- image: $CI_REGISTRY_IMAGE/ci-opensuse-151:latest
+ image: $CI_REGISTRY_IMAGE/ci-opensuse-152:latest
needs:
- - x64-opensuse-151-container
+ - x64-opensuse-152-container
before_script:
- *script_variables
script:
diff --git a/ci/containers/ci-opensuse-151.Dockerfile b/ci/containers/ci-opensuse-151.Dockerfile
deleted file mode 100644
index 9458d2de0c..0000000000
--- a/ci/containers/ci-opensuse-151.Dockerfile
+++ /dev/null
@@ -1,100 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-# $ lcitool dockerfile opensuse-151 libvirt
-#
-# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680
-FROM registry.opensuse.org/opensuse/leap:15.1
-
-RUN zypper update -y && \
- zypper install -y \
- audit-devel \
- augeas \
- augeas-lenses \
- avahi-devel \
- bash-completion \
- ca-certificates \
- ccache \
- clang \
- cppi \
- cyrus-sasl-devel \
- dbus-1-devel \
- device-mapper-devel \
- diffutils \
- dnsmasq \
- dwarves \
- ebtables \
- fuse-devel \
- gcc \
- gettext \
- git \
- glib2-devel \
- glibc-devel \
- glibc-locale \
- glusterfs-devel \
- iproute2 \
- 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 \
- parted-devel \
- perl \
- pkgconfig \
- polkit \
- python3 \
- python3-docutils \
- python3-flake8 \
- python3-pip \
- python3-setuptools \
- python3-wheel \
- qemu-tools \
- radvd \
- readline-devel \
- rpcgen \
- rpm-build \
- sanlock-devel \
- scrub \
- systemtap-sdt-devel \
- wireshark-devel \
- xen-devel \
- xfsprogs-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/$(basename /usr/bin/gcc)
-
-RUN pip3 install \
- meson==0.54.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
--
2.29.2
