From: Erik Skultety Date: Wed, 31 May 2023 09:32:09 +0000 (+0200) Subject: ci: refresh with latest lcitool manifest X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=adf67ca987539e531801ad41b35698e2861538d5;p=libvirt.git ci: refresh with latest lcitool manifest Main lcitool changes: - added Alpine 3.17 and 3.18 targets - dropped Alpine 3.15 and 3.16 Note that we're not actively testing all Alpine targets due to CI quota, so only 3.17 is used as a replacement for 3.15 in this patch. Signed-off-by: Erik Skultety Reviewed-by: Andrea Bolognani --- diff --git a/ci/buildenv/alpine-315.sh b/ci/buildenv/alpine-315.sh deleted file mode 100644 index 975914a7c2..0000000000 --- a/ci/buildenv/alpine-315.sh +++ /dev/null @@ -1,80 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - apk update - apk upgrade - apk add \ - acl-dev \ - attr-dev \ - audit-dev \ - augeas \ - bash-completion \ - ca-certificates \ - ccache \ - ceph-dev \ - clang \ - curl-dev \ - cyrus-sasl-dev \ - diffutils \ - eudev-dev \ - fuse-dev \ - gcc \ - gettext \ - git \ - glib-dev \ - gnutls-dev \ - grep \ - iproute2 \ - iptables \ - kmod \ - libcap-ng-dev \ - libnl3-dev \ - libpcap-dev \ - libpciaccess-dev \ - libselinux-dev \ - libssh-dev \ - libssh2-dev \ - libtirpc-dev \ - libxml2-dev \ - libxml2-utils \ - libxslt \ - lvm2 \ - lvm2-dev \ - make \ - meson \ - musl-dev \ - netcf-dev \ - nfs-utils \ - numactl-dev \ - open-iscsi \ - parted-dev \ - perl \ - pkgconf \ - polkit \ - py3-docutils \ - py3-flake8 \ - python3 \ - qemu-img \ - readline-dev \ - samurai \ - sed \ - util-linux-dev \ - wireshark-dev \ - xen-dev \ - yajl-dev - apk list | 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/clang - 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 NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" diff --git a/ci/buildenv/alpine-317.sh b/ci/buildenv/alpine-317.sh new file mode 100644 index 0000000000..e3f36ff8c6 --- /dev/null +++ b/ci/buildenv/alpine-317.sh @@ -0,0 +1,81 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + apk update + apk upgrade + apk add \ + acl-dev \ + attr-dev \ + audit-dev \ + augeas \ + bash-completion \ + ca-certificates \ + ccache \ + ceph-dev \ + clang \ + curl-dev \ + cyrus-sasl-dev \ + diffutils \ + eudev-dev \ + fuse-dev \ + gcc \ + gettext \ + git \ + glib-dev \ + gnutls-dev \ + grep \ + iproute2 \ + iptables \ + kmod \ + libcap-ng-dev \ + libnl3-dev \ + libpcap-dev \ + libpciaccess-dev \ + libselinux-dev \ + libssh-dev \ + libssh2-dev \ + libtirpc-dev \ + libxml2-dev \ + libxml2-utils \ + libxslt \ + lvm2 \ + lvm2-dev \ + make \ + meson \ + musl-dev \ + netcf-dev \ + nfs-utils \ + numactl-dev \ + open-iscsi \ + parted-dev \ + perl \ + pkgconf \ + polkit \ + py3-docutils \ + py3-flake8 \ + python3 \ + qemu-img \ + readline-dev \ + rpcgen \ + samurai \ + sed \ + util-linux-dev \ + wireshark-dev \ + xen-dev \ + yajl-dev + apk list | 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/clang + 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 NINJA="/usr/bin/ninja" +export PYTHON="/usr/bin/python3" diff --git a/ci/containers/alpine-315.Dockerfile b/ci/containers/alpine-315.Dockerfile deleted file mode 100644 index bad7e87c2b..0000000000 --- a/ci/containers/alpine-315.Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/alpine:3.15 - -RUN apk update && \ - apk upgrade && \ - apk add \ - acl-dev \ - attr-dev \ - audit-dev \ - augeas \ - bash-completion \ - ca-certificates \ - ccache \ - ceph-dev \ - clang \ - curl-dev \ - cyrus-sasl-dev \ - diffutils \ - eudev-dev \ - fuse-dev \ - gcc \ - gettext \ - git \ - glib-dev \ - gnutls-dev \ - grep \ - iproute2 \ - iptables \ - kmod \ - libcap-ng-dev \ - libnl3-dev \ - libpcap-dev \ - libpciaccess-dev \ - libselinux-dev \ - libssh-dev \ - libssh2-dev \ - libtirpc-dev \ - libxml2-dev \ - libxml2-utils \ - libxslt \ - lvm2 \ - lvm2-dev \ - make \ - meson \ - musl-dev \ - netcf-dev \ - nfs-utils \ - numactl-dev \ - open-iscsi \ - parted-dev \ - perl \ - pkgconf \ - polkit \ - py3-docutils \ - py3-flake8 \ - python3 \ - qemu-img \ - readline-dev \ - samurai \ - sed \ - util-linux-dev \ - wireshark-dev \ - xen-dev \ - yajl-dev && \ - apk list | 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/clang && \ - 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 NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" diff --git a/ci/containers/alpine-317.Dockerfile b/ci/containers/alpine-317.Dockerfile new file mode 100644 index 0000000000..162ae5671b --- /dev/null +++ b/ci/containers/alpine-317.Dockerfile @@ -0,0 +1,81 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/alpine:3.17 + +RUN apk update && \ + apk upgrade && \ + apk add \ + acl-dev \ + attr-dev \ + audit-dev \ + augeas \ + bash-completion \ + ca-certificates \ + ccache \ + ceph-dev \ + clang \ + curl-dev \ + cyrus-sasl-dev \ + diffutils \ + eudev-dev \ + fuse-dev \ + gcc \ + gettext \ + git \ + glib-dev \ + gnutls-dev \ + grep \ + iproute2 \ + iptables \ + kmod \ + libcap-ng-dev \ + libnl3-dev \ + libpcap-dev \ + libpciaccess-dev \ + libselinux-dev \ + libssh-dev \ + libssh2-dev \ + libtirpc-dev \ + libxml2-dev \ + libxml2-utils \ + libxslt \ + lvm2 \ + lvm2-dev \ + make \ + meson \ + musl-dev \ + netcf-dev \ + nfs-utils \ + numactl-dev \ + open-iscsi \ + parted-dev \ + perl \ + pkgconf \ + polkit \ + py3-docutils \ + py3-flake8 \ + python3 \ + qemu-img \ + readline-dev \ + rpcgen \ + samurai \ + sed \ + util-linux-dev \ + wireshark-dev \ + xen-dev \ + yajl-dev && \ + apk list | 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/clang && \ + 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 NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 96f8d3fb43..8910a19c79 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -51,22 +51,22 @@ x86_64-almalinux-8-clang-local-env: RPM: skip -x86_64-alpine-315-prebuilt-env: +x86_64-alpine-317-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-alpine-315-container + - job: x86_64-alpine-317-container optional: true allow_failure: false variables: - NAME: alpine-315 + NAME: alpine-317 -x86_64-alpine-315-local-env: +x86_64-alpine-317-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: docker.io/library/alpine:3.15 - NAME: alpine-315 + IMAGE: docker.io/library/alpine:3.17 + NAME: alpine-317 x86_64-alpine-edge-prebuilt-env: diff --git a/ci/gitlab/container-templates.yml b/ci/gitlab/container-templates.yml index edb4aba676..adc8a1a312 100644 --- a/ci/gitlab/container-templates.yml +++ b/ci/gitlab/container-templates.yml @@ -14,7 +14,7 @@ # Note: never publish from merge requests since they have non-committed code # .container_job: - image: docker:stable + image: docker:latest stage: containers interruptible: false needs: [] diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml index 3be84a2106..671483813e 100644 --- a/ci/gitlab/containers.yml +++ b/ci/gitlab/containers.yml @@ -14,11 +14,11 @@ x86_64-almalinux-8-container: NAME: almalinux-8 -x86_64-alpine-315-container: +x86_64-alpine-317-container: extends: .container_job allow_failure: false variables: - NAME: alpine-315 + NAME: alpine-317 x86_64-alpine-edge-container: diff --git a/ci/manifest.yml b/ci/manifest.yml index 85d699bfae..4504068a64 100644 --- a/ci/manifest.yml +++ b/ci/manifest.yml @@ -19,7 +19,7 @@ targets: RPM: skip CC: clang - alpine-315: x86_64 + alpine-317: x86_64 alpine-edge: jobs: