diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bfb66a652d..49f6d57a0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -291,11 +291,6 @@ i686-debian-sid-container: variables: NAME: debian-sid-cross-i686 -mips-debian-sid-container: - <<: *container_optional_job_definition - variables: - NAME: debian-sid-cross-mips - mips64el-debian-sid-container: <<: *container_optional_job_definition variables: diff --git a/ci/containers/libvirt-debian-sid-cross-mips.Dockerfile b/ci/containers/libvirt-debian-sid-cross-mips.Dockerfile deleted file mode 100644 index 4327b77e3b..0000000000 --- a/ci/containers/libvirt-debian-sid-cross-mips.Dockerfile +++ /dev/null @@ -1,121 +0,0 @@ -FROM debian:sid - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y \ - augeas-lenses \ - augeas-tools \ - autoconf \ - automake \ - autopoint \ - bash \ - bash-completion \ - ca-certificates \ - ccache \ - chrony \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - iproute2 \ - kmod \ - libc-dev-bin \ - libtool \ - libtool-bin \ - libxml2-utils \ - locales \ - lsof \ - lvm2 \ - make \ - meson \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - strace \ - sudo \ - vim \ - xsltproc \ - zfs-fuse && \ - apt-get autoremove -y && \ - apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-$(basename /usr/bin/gcc) - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mips && \ - apt-get update && \ - apt-get dist-upgrade -y && \ - apt-get install --no-install-recommends -y dpkg-dev && \ - apt-get install --no-install-recommends -y \ - gcc-mips-linux-gnu \ - libacl1-dev:mips \ - libapparmor-dev:mips \ - libattr1-dev:mips \ - libaudit-dev:mips \ - libavahi-client-dev:mips \ - libblkid-dev:mips \ - libc6-dev:mips \ - libcap-ng-dev:mips \ - libcurl4-gnutls-dev:mips \ - libdbus-1-dev:mips \ - libdevmapper-dev:mips \ - libfuse-dev:mips \ - libglib2.0-dev:mips \ - libglusterfs-dev:mips \ - libgnutls28-dev:mips \ - libiscsi-dev:mips \ - libncurses-dev:mips \ - libnl-3-dev:mips \ - libnl-route-3-dev:mips \ - libnuma-dev:mips \ - libparted-dev:mips \ - libpcap0.8-dev:mips \ - libpciaccess-dev:mips \ - librbd-dev:mips \ - libreadline-dev:mips \ - libsanlock-dev:mips \ - libsasl2-dev:mips \ - libselinux1-dev:mips \ - libssh-gcrypt-dev:mips \ - libssh2-1-dev:mips \ - libtirpc-dev:mips \ - libudev-dev:mips \ - libxml2-dev:mips \ - libyajl-dev:mips \ - xfslibs-dev:mips && \ - apt-get autoremove -y && \ - apt-get autoclean -y - -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" - -ENV ABI "mips-linux-gnu" -ENV CONFIGURE_OPTS "--host=mips-linux-gnu" diff --git a/ci/containers/refresh b/ci/containers/refresh index f457f3bc23..3a3594caa4 100755 --- a/ci/containers/refresh +++ b/ci/containers/refresh @@ -28,7 +28,8 @@ do libvirt-debian-*) for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64le s390x do - if test "$host" = "libvirt-debian-9" && test "$cross" = "i686" + if test "$host-cross-$cross" = "libvirt-debian-9-cross-i686" || + test "$host-cross-$cross" = "libvirt-debian-sid-cross-mips" then continue fi