Flip the codestyle job to this minor version from Leap 15.1 as well. Signed-off-by: Erik Skultety <eskultet@xxxxxxxxxx> --- .gitlab-ci.yml | 17 +++- ci/containers/ci-opensuse-152.Dockerfile | 100 +++++++++++++++++++++++ 2 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 ci/containers/ci-opensuse-152.Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 673327fb9e..8a8092390e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -177,6 +177,11 @@ x64-opensuse-151-container: variables: NAME: opensuse-151 +x64-opensuse-152-container: + extends: .container_job + variables: + NAME: opensuse-152 + x64-ubuntu-1804-container: extends: .container_job variables: @@ -385,6 +390,14 @@ x64-opensuse-151: NAME: opensuse-151 RPM: skip +x64-opensuse-152: + extends: .native_build_job + needs: + - x64-opensuse-152-container + variables: + NAME: opensuse-152 + RPM: skip + x64-ubuntu-1804: extends: .native_build_job needs: @@ -545,9 +558,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-152.Dockerfile b/ci/containers/ci-opensuse-152.Dockerfile new file mode 100644 index 0000000000..7f97c3ab70 --- /dev/null +++ b/ci/containers/ci-opensuse-152.Dockerfile @@ -0,0 +1,100 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile opensuse-152 libvirt +# +# https://gitlab.com/libvirt/libvirt-ci/-/commit/d527e0c012f476c293f3bc801b7da08bc85f98ef +FROM registry.opensuse.org/opensuse/leap:15.2 + +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-runtime \ + 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-base \ + 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