The esisting cross-compilation jobs are carefully redistributed among Debian 10 and Debian sid to ensure we don't use the latter for aarch64, mipsel or mips64el, since those architectures are currently broken. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .gitlab-ci.yml | 74 ++++++++------------------------------------------ 1 file changed, 12 insertions(+), 62 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5565750b7e..702198ec8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,11 +125,6 @@ x64-centos-stream-container: variables: NAME: centos-stream -x64-debian-9-container: - <<: *container_job_definition - variables: - NAME: debian-9 - x64-debian-10-container: <<: *container_job_definition variables: @@ -173,53 +168,13 @@ x64-ubuntu-2004-container: # Cross-build containers build jobs -aarch64-debian-9-container: - <<: *container_optional_job_definition - variables: - NAME: debian-9-cross-aarch64 - -armv6l-debian-9-container: - <<: *container_job_definition - variables: - NAME: debian-9-cross-armv6l - -armv7l-debian-9-container: - <<: *container_optional_job_definition - variables: - NAME: debian-9-cross-armv7l - -mips-debian-9-container: - <<: *container_job_definition - variables: - NAME: debian-9-cross-mips - -mips64el-debian-9-container: - <<: *container_job_definition - variables: - NAME: debian-9-cross-mips64el - -mipsel-debian-9-container: - <<: *container_optional_job_definition - variables: - NAME: debian-9-cross-mipsel - -ppc64le-debian-9-container: - <<: *container_optional_job_definition - variables: - NAME: debian-9-cross-ppc64le - -s390x-debian-9-container: - <<: *container_optional_job_definition - variables: - NAME: debian-9-cross-s390x - aarch64-debian-10-container: <<: *container_job_definition variables: NAME: debian-10-cross-aarch64 armv6l-debian-10-container: - <<: *container_optional_job_definition + <<: *container_job_definition variables: NAME: debian-10-cross-armv6l @@ -234,12 +189,12 @@ i686-debian-10-container: NAME: debian-10-cross-i686 mips-debian-10-container: - <<: *container_optional_job_definition + <<: *container_job_definition variables: NAME: debian-10-cross-mips mips64el-debian-10-container: - <<: *container_optional_job_definition + <<: *container_job_definition variables: NAME: debian-10-cross-mips64el @@ -254,7 +209,7 @@ ppc64le-debian-10-container: NAME: debian-10-cross-ppc64le s390x-debian-10-container: - <<: *container_job_definition + <<: *container_optional_job_definition variables: NAME: debian-10-cross-s390x @@ -311,11 +266,6 @@ mingw64-fedora-rawhide-container: # Native architecture build + test jobs -x64-debian-9: - <<: *native_build_job_definition - variables: - NAME: debian-9 - x64-debian-10: <<: *native_build_job_definition variables: @@ -394,22 +344,22 @@ x64-macos-1015-build: # Cross compiled build jobs -armv6l-debian-9: +armv6l-debian-10: <<: *cross_build_job_definition variables: - NAME: debian-9 + NAME: debian-10 CROSS: armv6l -mips64el-debian-9: +mips64el-debian-10: <<: *cross_build_job_definition variables: - NAME: debian-9 + NAME: debian-10 CROSS: mips64el -mips-debian-9: +mips-debian-10: <<: *cross_build_job_definition variables: - NAME: debian-9 + NAME: debian-10 CROSS: mips aarch64-debian-10: @@ -424,10 +374,10 @@ mipsel-debian-10: NAME: debian-10 CROSS: mipsel -s390x-debian-10: +s390x-debian-sid: <<: *cross_build_job_definition variables: - NAME: debian-10 + NAME: debian-sid CROSS: s390x armv7l-debian-sid: -- 2.25.4

The corresponding libvirt-ci commit is 5abf5e7e2326. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../libvirt-debian-9-cross-aarch64.Dockerfile | 128 ------------------ .../libvirt-debian-9-cross-armv6l.Dockerfile | 126 ----------------- .../libvirt-debian-9-cross-armv7l.Dockerfile | 127 ----------------- .../libvirt-debian-9-cross-mips.Dockerfile | 127 ----------------- ...libvirt-debian-9-cross-mips64el.Dockerfile | 127 ----------------- .../libvirt-debian-9-cross-mipsel.Dockerfile | 127 ----------------- .../libvirt-debian-9-cross-ppc64le.Dockerfile | 127 ----------------- .../libvirt-debian-9-cross-s390x.Dockerfile | 127 ----------------- ci/containers/libvirt-debian-9.Dockerfile | 118 ---------------- 9 files changed, 1134 deletions(-) delete mode 100644 ci/containers/libvirt-debian-9-cross-aarch64.Dockerfile delete mode 100644 ci/containers/libvirt-debian-9-cross-armv6l.Dockerfile delete mode 100644 ci/containers/libvirt-debian-9-cross-armv7l.Dockerfile delete mode 100644 ci/containers/libvirt-debian-9-cross-mips.Dockerfile delete mode 100644 ci/containers/libvirt-debian-9-cross-mips64el.Dockerfile delete mode 100644 ci/containers/libvirt-debian-9-cross-mipsel.Dockerfile delete mode 100644 ci/containers/libvirt-debian-9-cross-ppc64le.Dockerfile delete mode 100644 ci/containers/libvirt-debian-9-cross-s390x.Dockerfile delete mode 100644 ci/containers/libvirt-debian-9.Dockerfile diff --git a/ci/containers/libvirt-debian-9-cross-aarch64.Dockerfile b/ci/containers/libvirt-debian-9-cross-aarch64.Dockerfile deleted file mode 100644 index 8f7f794c9c..0000000000 --- a/ci/containers/libvirt-debian-9-cross-aarch64.Dockerfile +++ /dev/null @@ -1,128 +0,0 @@ -FROM debian:9 - -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 \ - cpanminus \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - iproute2 \ - kmod \ - libc-dev-bin \ - libtool \ - libtool-bin \ - libxml2-utils \ - locales \ - lsof \ - lvm2 \ - make \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - strace \ - sudo \ - vim \ - xsltproc \ - xz-utils \ - 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/aarch64-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-$(basename /usr/bin/gcc) - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture arm64 && \ - 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-aarch64-linux-gnu \ - glusterfs-common:arm64 \ - libacl1-dev:arm64 \ - libapparmor-dev:arm64 \ - libattr1-dev:arm64 \ - libaudit-dev:arm64 \ - libavahi-client-dev:arm64 \ - libblkid-dev:arm64 \ - libc6-dev:arm64 \ - libcap-ng-dev:arm64 \ - libcurl4-gnutls-dev:arm64 \ - libdbus-1-dev:arm64 \ - libdevmapper-dev:arm64 \ - libfuse-dev:arm64 \ - libglib2.0-dev:arm64 \ - libgnutls28-dev:arm64 \ - libiscsi-dev:arm64 \ - libncurses5-dev:arm64 \ - libnl-3-dev:arm64 \ - libnl-route-3-dev:arm64 \ - libnuma-dev:arm64 \ - libparted-dev:arm64 \ - libpcap0.8-dev:arm64 \ - libpciaccess-dev:arm64 \ - librbd-dev:arm64 \ - libreadline-dev:arm64 \ - libsanlock-dev:arm64 \ - libsasl2-dev:arm64 \ - libselinux1-dev:arm64 \ - libssh-gcrypt-dev:arm64 \ - libssh2-1-dev:arm64 \ - libtirpc-dev:arm64 \ - libudev-dev:arm64 \ - libxen-dev:arm64 \ - libxml2-dev:arm64 \ - libyajl-dev:arm64 \ - xfslibs-dev:arm64 && \ - apt-get autoremove -y && \ - apt-get autoclean -y - -RUN pip3 install \ - meson==0.49.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" - -ENV ABI "aarch64-linux-gnu" -ENV CONFIGURE_OPTS "--host=aarch64-linux-gnu" diff --git a/ci/containers/libvirt-debian-9-cross-armv6l.Dockerfile b/ci/containers/libvirt-debian-9-cross-armv6l.Dockerfile deleted file mode 100644 index 1dcb575099..0000000000 --- a/ci/containers/libvirt-debian-9-cross-armv6l.Dockerfile +++ /dev/null @@ -1,126 +0,0 @@ -FROM debian:9 - -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 \ - cpanminus \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - iproute2 \ - kmod \ - libc-dev-bin \ - libtool \ - libtool-bin \ - libxml2-utils \ - locales \ - lsof \ - lvm2 \ - make \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - strace \ - sudo \ - vim \ - xsltproc \ - xz-utils \ - 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/arm-linux-gnueabi-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-$(basename /usr/bin/gcc) - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture armel && \ - 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-arm-linux-gnueabi \ - glusterfs-common:armel \ - libacl1-dev:armel \ - libapparmor-dev:armel \ - libattr1-dev:armel \ - libaudit-dev:armel \ - libavahi-client-dev:armel \ - libblkid-dev:armel \ - libc6-dev:armel \ - libcap-ng-dev:armel \ - libcurl4-gnutls-dev:armel \ - libdbus-1-dev:armel \ - libdevmapper-dev:armel \ - libfuse-dev:armel \ - libglib2.0-dev:armel \ - libgnutls28-dev:armel \ - libiscsi-dev:armel \ - libncurses5-dev:armel \ - libnl-3-dev:armel \ - libnl-route-3-dev:armel \ - libparted-dev:armel \ - libpcap0.8-dev:armel \ - libpciaccess-dev:armel \ - librbd-dev:armel \ - libreadline-dev:armel \ - libsanlock-dev:armel \ - libsasl2-dev:armel \ - libselinux1-dev:armel \ - libssh-gcrypt-dev:armel \ - libssh2-1-dev:armel \ - libtirpc-dev:armel \ - libudev-dev:armel \ - libxml2-dev:armel \ - libyajl-dev:armel \ - xfslibs-dev:armel && \ - apt-get autoremove -y && \ - apt-get autoclean -y - -RUN pip3 install \ - meson==0.49.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" - -ENV ABI "arm-linux-gnueabi" -ENV CONFIGURE_OPTS "--host=arm-linux-gnueabi" diff --git a/ci/containers/libvirt-debian-9-cross-armv7l.Dockerfile b/ci/containers/libvirt-debian-9-cross-armv7l.Dockerfile deleted file mode 100644 index e7016b622e..0000000000 --- a/ci/containers/libvirt-debian-9-cross-armv7l.Dockerfile +++ /dev/null @@ -1,127 +0,0 @@ -FROM debian:9 - -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 \ - cpanminus \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - iproute2 \ - kmod \ - libc-dev-bin \ - libtool \ - libtool-bin \ - libxml2-utils \ - locales \ - lsof \ - lvm2 \ - make \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - strace \ - sudo \ - vim \ - xsltproc \ - xz-utils \ - 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/arm-linux-gnueabihf-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-$(basename /usr/bin/gcc) - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture armhf && \ - 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-arm-linux-gnueabihf \ - glusterfs-common:armhf \ - libacl1-dev:armhf \ - libapparmor-dev:armhf \ - libattr1-dev:armhf \ - libaudit-dev:armhf \ - libavahi-client-dev:armhf \ - libblkid-dev:armhf \ - libc6-dev:armhf \ - libcap-ng-dev:armhf \ - libcurl4-gnutls-dev:armhf \ - libdbus-1-dev:armhf \ - libdevmapper-dev:armhf \ - libfuse-dev:armhf \ - libglib2.0-dev:armhf \ - libgnutls28-dev:armhf \ - libiscsi-dev:armhf \ - libncurses5-dev:armhf \ - libnl-3-dev:armhf \ - libnl-route-3-dev:armhf \ - libparted-dev:armhf \ - libpcap0.8-dev:armhf \ - libpciaccess-dev:armhf \ - librbd-dev:armhf \ - libreadline-dev:armhf \ - libsanlock-dev:armhf \ - libsasl2-dev:armhf \ - libselinux1-dev:armhf \ - libssh-gcrypt-dev:armhf \ - libssh2-1-dev:armhf \ - libtirpc-dev:armhf \ - libudev-dev:armhf \ - libxen-dev:armhf \ - libxml2-dev:armhf \ - libyajl-dev:armhf \ - xfslibs-dev:armhf && \ - apt-get autoremove -y && \ - apt-get autoclean -y - -RUN pip3 install \ - meson==0.49.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" - -ENV ABI "arm-linux-gnueabihf" -ENV CONFIGURE_OPTS "--host=arm-linux-gnueabihf" diff --git a/ci/containers/libvirt-debian-9-cross-mips.Dockerfile b/ci/containers/libvirt-debian-9-cross-mips.Dockerfile deleted file mode 100644 index f25dc05be4..0000000000 --- a/ci/containers/libvirt-debian-9-cross-mips.Dockerfile +++ /dev/null @@ -1,127 +0,0 @@ -FROM debian:9 - -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 \ - cpanminus \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - iproute2 \ - kmod \ - libc-dev-bin \ - libtool \ - libtool-bin \ - libxml2-utils \ - locales \ - lsof \ - lvm2 \ - make \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - strace \ - sudo \ - vim \ - xsltproc \ - xz-utils \ - 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 \ - glusterfs-common:mips \ - 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 \ - libgnutls28-dev:mips \ - libiscsi-dev:mips \ - libncurses5-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 - -RUN pip3 install \ - meson==0.49.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" - -ENV ABI "mips-linux-gnu" -ENV CONFIGURE_OPTS "--host=mips-linux-gnu" diff --git a/ci/containers/libvirt-debian-9-cross-mips64el.Dockerfile b/ci/containers/libvirt-debian-9-cross-mips64el.Dockerfile deleted file mode 100644 index 810798124b..0000000000 --- a/ci/containers/libvirt-debian-9-cross-mips64el.Dockerfile +++ /dev/null @@ -1,127 +0,0 @@ -FROM debian:9 - -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 \ - cpanminus \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - iproute2 \ - kmod \ - libc-dev-bin \ - libtool \ - libtool-bin \ - libxml2-utils \ - locales \ - lsof \ - lvm2 \ - make \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - strace \ - sudo \ - vim \ - xsltproc \ - xz-utils \ - 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/mips64el-linux-gnuabi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-$(basename /usr/bin/gcc) - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mips64el && \ - 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-mips64el-linux-gnuabi64 \ - glusterfs-common:mips64el \ - libacl1-dev:mips64el \ - libapparmor-dev:mips64el \ - libattr1-dev:mips64el \ - libaudit-dev:mips64el \ - libavahi-client-dev:mips64el \ - libblkid-dev:mips64el \ - libc6-dev:mips64el \ - libcap-ng-dev:mips64el \ - libcurl4-gnutls-dev:mips64el \ - libdbus-1-dev:mips64el \ - libdevmapper-dev:mips64el \ - libfuse-dev:mips64el \ - libglib2.0-dev:mips64el \ - libgnutls28-dev:mips64el \ - libiscsi-dev:mips64el \ - libncurses5-dev:mips64el \ - libnl-3-dev:mips64el \ - libnl-route-3-dev:mips64el \ - libnuma-dev:mips64el \ - libparted-dev:mips64el \ - libpcap0.8-dev:mips64el \ - libpciaccess-dev:mips64el \ - librbd-dev:mips64el \ - libreadline-dev:mips64el \ - libsanlock-dev:mips64el \ - libsasl2-dev:mips64el \ - libselinux1-dev:mips64el \ - libssh-gcrypt-dev:mips64el \ - libssh2-1-dev:mips64el \ - libtirpc-dev:mips64el \ - libudev-dev:mips64el \ - libxml2-dev:mips64el \ - libyajl-dev:mips64el \ - xfslibs-dev:mips64el && \ - apt-get autoremove -y && \ - apt-get autoclean -y - -RUN pip3 install \ - meson==0.49.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" - -ENV ABI "mips64el-linux-gnuabi64" -ENV CONFIGURE_OPTS "--host=mips64el-linux-gnuabi64" diff --git a/ci/containers/libvirt-debian-9-cross-mipsel.Dockerfile b/ci/containers/libvirt-debian-9-cross-mipsel.Dockerfile deleted file mode 100644 index 37afc5f6a4..0000000000 --- a/ci/containers/libvirt-debian-9-cross-mipsel.Dockerfile +++ /dev/null @@ -1,127 +0,0 @@ -FROM debian:9 - -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 \ - cpanminus \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - iproute2 \ - kmod \ - libc-dev-bin \ - libtool \ - libtool-bin \ - libxml2-utils \ - locales \ - lsof \ - lvm2 \ - make \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - strace \ - sudo \ - vim \ - xsltproc \ - xz-utils \ - 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/mipsel-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-$(basename /usr/bin/gcc) - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture mipsel && \ - 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-mipsel-linux-gnu \ - glusterfs-common:mipsel \ - libacl1-dev:mipsel \ - libapparmor-dev:mipsel \ - libattr1-dev:mipsel \ - libaudit-dev:mipsel \ - libavahi-client-dev:mipsel \ - libblkid-dev:mipsel \ - libc6-dev:mipsel \ - libcap-ng-dev:mipsel \ - libcurl4-gnutls-dev:mipsel \ - libdbus-1-dev:mipsel \ - libdevmapper-dev:mipsel \ - libfuse-dev:mipsel \ - libglib2.0-dev:mipsel \ - libgnutls28-dev:mipsel \ - libiscsi-dev:mipsel \ - libncurses5-dev:mipsel \ - libnl-3-dev:mipsel \ - libnl-route-3-dev:mipsel \ - libnuma-dev:mipsel \ - libparted-dev:mipsel \ - libpcap0.8-dev:mipsel \ - libpciaccess-dev:mipsel \ - librbd-dev:mipsel \ - libreadline-dev:mipsel \ - libsanlock-dev:mipsel \ - libsasl2-dev:mipsel \ - libselinux1-dev:mipsel \ - libssh-gcrypt-dev:mipsel \ - libssh2-1-dev:mipsel \ - libtirpc-dev:mipsel \ - libudev-dev:mipsel \ - libxml2-dev:mipsel \ - libyajl-dev:mipsel \ - xfslibs-dev:mipsel && \ - apt-get autoremove -y && \ - apt-get autoclean -y - -RUN pip3 install \ - meson==0.49.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" - -ENV ABI "mipsel-linux-gnu" -ENV CONFIGURE_OPTS "--host=mipsel-linux-gnu" diff --git a/ci/containers/libvirt-debian-9-cross-ppc64le.Dockerfile b/ci/containers/libvirt-debian-9-cross-ppc64le.Dockerfile deleted file mode 100644 index 41f96abed1..0000000000 --- a/ci/containers/libvirt-debian-9-cross-ppc64le.Dockerfile +++ /dev/null @@ -1,127 +0,0 @@ -FROM debian:9 - -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 \ - cpanminus \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - iproute2 \ - kmod \ - libc-dev-bin \ - libtool \ - libtool-bin \ - libxml2-utils \ - locales \ - lsof \ - lvm2 \ - make \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - strace \ - sudo \ - vim \ - xsltproc \ - xz-utils \ - 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/powerpc64le-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-$(basename /usr/bin/gcc) - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture ppc64el && \ - 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-powerpc64le-linux-gnu \ - glusterfs-common:ppc64el \ - libacl1-dev:ppc64el \ - libapparmor-dev:ppc64el \ - libattr1-dev:ppc64el \ - libaudit-dev:ppc64el \ - libavahi-client-dev:ppc64el \ - libblkid-dev:ppc64el \ - libc6-dev:ppc64el \ - libcap-ng-dev:ppc64el \ - libcurl4-gnutls-dev:ppc64el \ - libdbus-1-dev:ppc64el \ - libdevmapper-dev:ppc64el \ - libfuse-dev:ppc64el \ - libglib2.0-dev:ppc64el \ - libgnutls28-dev:ppc64el \ - libiscsi-dev:ppc64el \ - libncurses5-dev:ppc64el \ - libnl-3-dev:ppc64el \ - libnl-route-3-dev:ppc64el \ - libnuma-dev:ppc64el \ - libparted-dev:ppc64el \ - libpcap0.8-dev:ppc64el \ - libpciaccess-dev:ppc64el \ - librbd-dev:ppc64el \ - libreadline-dev:ppc64el \ - libsanlock-dev:ppc64el \ - libsasl2-dev:ppc64el \ - libselinux1-dev:ppc64el \ - libssh-gcrypt-dev:ppc64el \ - libssh2-1-dev:ppc64el \ - libtirpc-dev:ppc64el \ - libudev-dev:ppc64el \ - libxml2-dev:ppc64el \ - libyajl-dev:ppc64el \ - xfslibs-dev:ppc64el && \ - apt-get autoremove -y && \ - apt-get autoclean -y - -RUN pip3 install \ - meson==0.49.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" - -ENV ABI "powerpc64le-linux-gnu" -ENV CONFIGURE_OPTS "--host=powerpc64le-linux-gnu" diff --git a/ci/containers/libvirt-debian-9-cross-s390x.Dockerfile b/ci/containers/libvirt-debian-9-cross-s390x.Dockerfile deleted file mode 100644 index c200dc92b0..0000000000 --- a/ci/containers/libvirt-debian-9-cross-s390x.Dockerfile +++ /dev/null @@ -1,127 +0,0 @@ -FROM debian:9 - -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 \ - cpanminus \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - iproute2 \ - kmod \ - libc-dev-bin \ - libtool \ - libtool-bin \ - libxml2-utils \ - locales \ - lsof \ - lvm2 \ - make \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - strace \ - sudo \ - vim \ - xsltproc \ - xz-utils \ - 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/s390x-linux-gnu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-$(basename /usr/bin/gcc) - -RUN export DEBIAN_FRONTEND=noninteractive && \ - dpkg --add-architecture s390x && \ - 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-s390x-linux-gnu \ - glusterfs-common:s390x \ - libacl1-dev:s390x \ - libapparmor-dev:s390x \ - libattr1-dev:s390x \ - libaudit-dev:s390x \ - libavahi-client-dev:s390x \ - libblkid-dev:s390x \ - libc6-dev:s390x \ - libcap-ng-dev:s390x \ - libcurl4-gnutls-dev:s390x \ - libdbus-1-dev:s390x \ - libdevmapper-dev:s390x \ - libfuse-dev:s390x \ - libglib2.0-dev:s390x \ - libgnutls28-dev:s390x \ - libiscsi-dev:s390x \ - libncurses5-dev:s390x \ - libnl-3-dev:s390x \ - libnl-route-3-dev:s390x \ - libnuma-dev:s390x \ - libparted-dev:s390x \ - libpcap0.8-dev:s390x \ - libpciaccess-dev:s390x \ - librbd-dev:s390x \ - libreadline-dev:s390x \ - libsanlock-dev:s390x \ - libsasl2-dev:s390x \ - libselinux1-dev:s390x \ - libssh-gcrypt-dev:s390x \ - libssh2-1-dev:s390x \ - libtirpc-dev:s390x \ - libudev-dev:s390x \ - libxml2-dev:s390x \ - libyajl-dev:s390x \ - xfslibs-dev:s390x && \ - apt-get autoremove -y && \ - apt-get autoclean -y - -RUN pip3 install \ - meson==0.49.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" - -ENV ABI "s390x-linux-gnu" -ENV CONFIGURE_OPTS "--host=s390x-linux-gnu" diff --git a/ci/containers/libvirt-debian-9.Dockerfile b/ci/containers/libvirt-debian-9.Dockerfile deleted file mode 100644 index 0aa24b6f2c..0000000000 --- a/ci/containers/libvirt-debian-9.Dockerfile +++ /dev/null @@ -1,118 +0,0 @@ -FROM debian:9 - -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 \ - cpanminus \ - dnsmasq-base \ - dwarves \ - ebtables \ - flake8 \ - gcc \ - gdb \ - gettext \ - git \ - glusterfs-common \ - iproute2 \ - kmod \ - libacl1-dev \ - libapparmor-dev \ - libattr1-dev \ - libaudit-dev \ - libavahi-client-dev \ - libblkid-dev \ - libc-dev-bin \ - libc6-dev \ - libcap-ng-dev \ - libcurl4-gnutls-dev \ - libdbus-1-dev \ - libdevmapper-dev \ - libfuse-dev \ - libglib2.0-dev \ - libgnutls28-dev \ - libiscsi-dev \ - libncurses5-dev \ - libnetcf-dev \ - libnl-3-dev \ - libnl-route-3-dev \ - libnuma-dev \ - libparted-dev \ - libpcap0.8-dev \ - libpciaccess-dev \ - librbd-dev \ - libreadline-dev \ - libsanlock-dev \ - libsasl2-dev \ - libselinux1-dev \ - libssh-gcrypt-dev \ - libssh2-1-dev \ - libtirpc-dev \ - libtool \ - libtool-bin \ - libudev-dev \ - libxen-dev \ - libxml2-dev \ - libxml2-utils \ - libyajl-dev \ - locales \ - lsof \ - lvm2 \ - make \ - net-tools \ - nfs-common \ - ninja-build \ - numad \ - open-iscsi \ - parted \ - patch \ - perl \ - pkgconf \ - policykit-1 \ - python3 \ - python3-docutils \ - python3-pip \ - python3-setuptools \ - python3-wheel \ - qemu-utils \ - radvd \ - screen \ - scrub \ - sheepdog \ - strace \ - sudo \ - systemtap-sdt-dev \ - vim \ - wireshark-dev \ - xfslibs-dev \ - xsltproc \ - xz-utils \ - 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/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) - -RUN pip3 install \ - meson==0.49.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.25.4