[Libguestfs] [nbdkit PATCH 01/10] ci: Update with lcitool

Fix a typo and add opensuse-leap-154, then rerun 'lcitool manifest ci/manifest.yml' to pick up recent changes in lcitool that fix mingw builds and improve how much time CI jobs can take. --- ci/build.sh | 2 +- ci/buildenv/fedora-35-cross-mingw32.sh | 2 +- ci/buildenv/fedora-35-cross-mingw64.sh | 2 +- ci/buildenv/opensuse-leap-154.sh | 71 ++++++++++++++++++ .../fedora-35-cross-mingw32.Dockerfile | 2 +- .../fedora-35-cross-mingw64.Dockerfile | 2 +- ci/containers/opensuse-leap-154.Dockerfile | 72 +++++++++++++++++++ ci/gitlab.yml | 1 + ci/gitlab/build-templates.yml | 5 ++ ci/gitlab/builds.yml | 18 +++++ ci/gitlab/container-templates.yml | 1 + ci/gitlab/containers.yml | 7 ++ ci/manifest.yml | 2 + 13 files changed, 182 insertions(+), 5 deletions(-) create mode 100644 ci/buildenv/opensuse-leap-154.sh create mode 100644 ci/containers/opensuse-leap-154.Dockerfile diff --git a/ci/build.sh b/ci/build.sh index aad31e3f..7d31d5c5 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -4,7 +4,7 @@ set -xe skip_tests() { # Add a way to run all the tests, even the skipped ones, with an environment - # variable, so that it can be set fora branch or fork in GitLab. + # variable, so that it can be set for a branch or fork in GitLab. if test "$SKIPPED_TESTS" != "force" then # Skip tests from ci/skipped_tests if this is the right OS version diff --git a/ci/buildenv/fedora-35-cross-mingw32.sh b/ci/buildenv/fedora-35-cross-mingw32.sh index 25473bd8..7d0b65c9 100644 --- a/ci/buildenv/fedora-35-cross-mingw32.sh +++ b/ci/buildenv/fedora-35-cross-mingw32.sh @@ -69,4 +69,4 @@ export MAKE="/usr/bin/make" export PYTHON="/usr/bin/python3" export ABI="i686-w64-mingw32" -export CONFIGURE_OPTS="--hosti686-w64-mingw32" +export CONFIGURE_OPTS="--host=i686-w64-mingw32" diff --git a/ci/buildenv/fedora-35-cross-mingw64.sh b/ci/buildenv/fedora-35-cross-mingw64.sh index 59802779..b8bbbff7 100644 --- a/ci/buildenv/fedora-35-cross-mingw64.sh +++ b/ci/buildenv/fedora-35-cross-mingw64.sh @@ -69,4 +69,4 @@ export MAKE="/usr/bin/make" export PYTHON="/usr/bin/python3" export ABI="x86_64-w64-mingw32" -export CONFIGURE_OPTS="--hostx86_64-w64-mingw32" +export CONFIGURE_OPTS="--host=x86_64-w64-mingw32" diff --git a/ci/buildenv/opensuse-leap-154.sh b/ci/buildenv/opensuse-leap-154.sh new file mode 100644 index 00000000..2c6f9a2e --- /dev/null +++ b/ci/buildenv/opensuse-leap-154.sh @@ -0,0 +1,71 @@ +# 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 \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + cargo \ + ccache \ + clang \ + e2fsprogs \ + expect \ + gcc \ + gcc-c++ \ + git \ + glibc-locale \ + go \ + gzip \ + iproute2 \ + jq \ + libcurl-devel \ + libgnutls-devel \ + libguestfs-devel \ + libnbd-devel \ + libselinux-devel \ + libssh-devel \ + libtool \ + libtorrent-devel \ + libvirt-devel \ + libzstd-devel \ + lua-devel \ + make \ + mkisofs \ + ocaml \ + perl \ + perl-Pod-Simple \ + perl-base \ + pkgconfig \ + python3-base \ + python3-boto3 \ + python3-devel \ + python3-flake8 \ + qemu-tools \ + rust \ + socat \ + tcl-devel \ + util-linux \ + xorriso \ + xz \ + xz-devel \ + zlib-devel + rpm -qa | sort > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ + 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/g++ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +} + +export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +export LANG="en_US.UTF-8" +export MAKE="/usr/bin/make" +export PYTHON="/usr/bin/python3" diff --git a/ci/containers/fedora-35-cross-mingw32.Dockerfile b/ci/containers/fedora-35-cross-mingw32.Dockerfile index 9dfb1b70..30c5170e 100644 --- a/ci/containers/fedora-35-cross-mingw32.Dockerfile +++ b/ci/containers/fedora-35-cross-mingw32.Dockerfile @@ -83,4 +83,4 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-w64-mingw32-gcc ENV ABI "i686-w64-mingw32" -ENV CONFIGURE_OPTS "--hosti686-w64-mingw32" +ENV CONFIGURE_OPTS "--host=i686-w64-mingw32" diff --git a/ci/containers/fedora-35-cross-mingw64.Dockerfile b/ci/containers/fedora-35-cross-mingw64.Dockerfile index c7bcf4fe..9f61835d 100644 --- a/ci/containers/fedora-35-cross-mingw64.Dockerfile +++ b/ci/containers/fedora-35-cross-mingw64.Dockerfile @@ -83,4 +83,4 @@ RUN nosync dnf install -y \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-gcc ENV ABI "x86_64-w64-mingw32" -ENV CONFIGURE_OPTS "--hostx86_64-w64-mingw32" +ENV CONFIGURE_OPTS "--host=x86_64-w64-mingw32" diff --git a/ci/containers/opensuse-leap-154.Dockerfile b/ci/containers/opensuse-leap-154.Dockerfile new file mode 100644 index 00000000..498136c3 --- /dev/null +++ b/ci/containers/opensuse-leap-154.Dockerfile @@ -0,0 +1,72 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.opensuse.org/opensuse/leap:15.4 + +RUN zypper update -y && \ + zypper install -y \ + autoconf \ + automake \ + bash \ + bash-completion \ + ca-certificates \ + cargo \ + ccache \ + clang \ + e2fsprogs \ + expect \ + gcc \ + gcc-c++ \ + git \ + glibc-locale \ + go \ + gzip \ + iproute2 \ + jq \ + libcurl-devel \ + libgnutls-devel \ + libguestfs-devel \ + libnbd-devel \ + libselinux-devel \ + libssh-devel \ + libtool \ + libtorrent-devel \ + libvirt-devel \ + libzstd-devel \ + lua-devel \ + make \ + mkisofs \ + ocaml \ + perl \ + perl-Pod-Simple \ + perl-base \ + pkgconfig \ + python3-base \ + python3-boto3 \ + python3-devel \ + python3-flake8 \ + qemu-tools \ + rust \ + socat \ + tcl-devel \ + util-linux \ + xorriso \ + xz \ + xz-devel \ + zlib-devel && \ + zypper clean --all && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ + 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/g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV PYTHON "/usr/bin/python3" diff --git a/ci/gitlab.yml b/ci/gitlab.yml index d1cb3934..68ffe725 100644 --- a/ci/gitlab.yml +++ b/ci/gitlab.yml @@ -67,6 +67,7 @@ workflow: debug: image: docker.io/library/alpine:3 stage: sanity_checks + interruptible: true needs: [] script: - printenv | sort diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 8c56851f..afe33739 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -26,6 +26,7 @@ .gitlab_native_build_job_prebuilt_env: image: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/nbdkit/ci-$NAME:latest stage: builds + interruptible: true before_script: - cat /packages.txt rules: @@ -61,6 +62,7 @@ .gitlab_native_build_job_local_env: image: $IMAGE stage: builds + interruptible: true before_script: - source ci/buildenv/$NAME.sh - install_buildenv @@ -138,6 +140,7 @@ .gitlab_cross_build_job_prebuilt_env: image: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/nbdkit/ci-$NAME-cross-$CROSS:latest stage: builds + interruptible: true before_script: - cat /packages.txt rules: @@ -173,6 +176,7 @@ .gitlab_cross_build_job_local_env: image: $IMAGE stage: builds + interruptible: true before_script: - source ci/buildenv/$NAME.sh - install_buildenv @@ -232,6 +236,7 @@ .cirrus_build_job: stage: builds image: registry.gitlab.com/libvirt/libvirt-ci/cirrus-run:master + interruptible: true needs: [] script: - source ci/cirrus/$NAME.vars diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index b8793a5a..d0bc2653 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -237,6 +237,24 @@ x86_64-opensuse-leap-153-local-env: NAME: opensuse-leap-153 +x86_64-opensuse-leap-154-prebuilt-env: + extends: .native_build_job_prebuilt_env + needs: + - job: x86_64-opensuse-leap-154-container + optional: true + allow_failure: false + variables: + NAME: opensuse-leap-154 + +x86_64-opensuse-leap-154-local-env: + extends: .native_build_job_local_env + needs: [] + allow_failure: false + variables: + IMAGE: registry.opensuse.org/opensuse/leap:15.4 + NAME: opensuse-leap-154 + + x86_64-opensuse-tumbleweed-prebuilt-env: extends: .native_build_job_prebuilt_env needs: diff --git a/ci/gitlab/container-templates.yml b/ci/gitlab/container-templates.yml index a577028d..edb4aba6 100644 --- a/ci/gitlab/container-templates.yml +++ b/ci/gitlab/container-templates.yml @@ -16,6 +16,7 @@ .container_job: image: docker:stable stage: containers + interruptible: false needs: [] services: - docker:dind diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index d812baea..9b6da610 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -77,6 +77,13 @@ x86_64-opensuse-leap-153-container: NAME: opensuse-leap-153 +x86_64-opensuse-leap-154-container: + extends: .container_job + allow_failure: false + variables: + NAME: opensuse-leap-154 + + x86_64-opensuse-tumbleweed-container: extends: .container_job allow_failure: false diff --git a/ci/manifest.yml b/ci/manifest.yml index 57442b1a..6ef9f576 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -93,6 +93,8 @@ targets: opensuse-leap-153: x86_64 + opensuse-leap-154: x86_64 + opensuse-tumbleweed: x86_64 macos-11: -- 2.37.3