[Pkg-libvirt-commits] [Git][libvirt-team/libvirt][debian/latest] 8 commits: salsa: Use standard pipeline
Andrea Bolognani (@abologna)
gitlab at salsa.debian.org
Wed Dec 15 20:26:50 GMT 2021
Andrea Bolognani pushed to branch debian/latest at Libvirt Packaging Team / libvirt
Commits:
7328e71a by Andrea Bolognani at 2021-12-09T22:21:52+01:00
salsa: Use standard pipeline
Back when we enabled CI support in libvirt, Salsa would hang
because of the massive amount of output produced during a
build of libvirt.
Either the switch to Meson has improved the situation or Salsa
has been changed in ways that make it less affected by it:
either way, the standard pipeline works fine now. We just need
to disable the reprotest job because libvirt is currently not
reproducible.
Gbp-Dch: Ignore
- - - - -
181eb07e by Andrea Bolognani at 2021-12-09T22:21:52+01:00
source: Exclude scripts correctly
The current pattern doesn't actually work as intended.
Gbp-Dch: Ignore
- - - - -
5913f305 by Andrea Bolognani at 2021-12-15T14:37:36+01:00
rules: Perform more thorough error checking
If any command in a 'for' loop fails, we want the entire build
to be aborted.
Gbp-Dch: Ignore
- - - - -
53a7a787 by Andrea Bolognani at 2021-12-15T14:37:40+01:00
rules: Use execute_after_dh_* instead of override_dh_*
This is available in debhelper compat 13, and it's a bit
cleaner when we only want to execute some additional commands
instead of actually overriding the dh_* command entirely.
Gbp-Dch: Ignore
- - - - -
24235dcb by Andrea Bolognani at 2021-12-15T14:37:40+01:00
libvirt-daemon-system: Don't install policy as example
The file is already installed under /usr/share/polkit-1 along
with the rest of the policykit configuration.
Gbp-Dch: Ignore
- - - - -
e9410b34 by Andrea Bolognani at 2021-12-15T14:37:40+01:00
libvirt-daemon-system: Change how we install sysctl example
Instead of installing the example from the source directory
and marking the copy that Meson copied into $(DESTDIR) as not
installed to appease dh_missing, install it from $(DESTDIR)
like every other file. We just need to rename it first.
Gbp-Dch: Ignore
- - - - -
26f63eb0 by Andrea Bolognani at 2021-12-15T14:37:40+01:00
control: Build-Depend on python3:any to fix cross-building
This will cause the native Python interpreter to be installed
and thus usable during build.
- - - - -
81cf0444 by Andrea Bolognani at 2021-12-15T14:37:40+01:00
salsa: Mark the cross-build job as required
Gbp-Dch: Ignore
- - - - -
6 changed files:
- debian/control
- debian/libvirt-daemon-system.examples
- debian/not-installed
- debian/rules
- debian/salsa-ci.yml
- debian/source/options
Changes:
=====================================
debian/control
=====================================
@@ -57,8 +57,8 @@ Build-Depends:
parted (>= 2.2),
po-debconf,
policykit-1 (>= 0.105-4~) [linux-any],
- python3,
python3-docutils,
+ python3:any,
qemu-system-common,
qemu-utils,
radvd [linux-any],
=====================================
debian/libvirt-daemon-system.examples
=====================================
@@ -1,2 +1 @@
-src/remote/libvirtd.policy
-src/remote/libvirtd.sysctl
+usr/lib/sysctl.d/libvirtd.sysctl
=====================================
debian/not-installed
=====================================
@@ -12,8 +12,6 @@ etc/default/virtsecretd
etc/default/virtstoraged
etc/default/virtvboxd
etc/default/virtxend
-# Installed in examples already
-usr/lib/sysctl.d/60-libvirtd.conf
# Drop these once we start shipping split daemons
etc/libvirt/virtinterfaced.conf
etc/libvirt/virtlxcd.conf
=====================================
debian/rules
=====================================
@@ -205,12 +205,12 @@ override_dh_auto_test:
# we're not interested in, move things around) so that later calls to the
# various dh_* tools will work optimally. This target is the perfect place
# to perform such operations
-override_dh_auto_install:
- dh_auto_install
-
+execute_after_dh_auto_install:
# Move upstream files where dh_* can find them
mv $(DEB_DESTDIR)/etc/sysconfig/ \
$(DEB_DESTDIR)/etc/default/
+ mv $(DEB_DESTDIR)/usr/lib/sysctl.d/60-libvirtd.conf \
+ $(DEB_DESTDIR)/usr/lib/sysctl.d/libvirtd.sysctl
# Copy the release notes where dh_installdocs can find them
cp NEWS.rst \
@@ -242,9 +242,7 @@ override_dh_auto_install:
$(DEB_DESTDIR)/etc/libvirt/nwfilter/ \
$(DEB_DESTDIR)/usr/share/libvirt/
-override_dh_install-arch:
- dh_install
-
+execute_after_dh_install:
ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
# Linux supports more nice things:
set -e; for f in $(SRV_MONOLITHIC); do \
@@ -253,13 +251,13 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
lib/systemd/system/; \
done
dh_install -p libvirt-daemon usr/lib/libvirt/virt-aa-helper
- for f in $(APPARMOR_ABSTRACTIONS); do \
+ set -e; for f in $(APPARMOR_ABSTRACTIONS); do \
dh_install -p libvirt-daemon-system etc/apparmor.d/abstractions/$${f}; \
done
- for f in $(APPARMOR_TEMPLATES); do \
+ set -e; for f in $(APPARMOR_TEMPLATES); do \
dh_install -p libvirt-daemon-system etc/apparmor.d/libvirt/$${f}; \
done
- for f in $(APPARMOR_SERVICES); do \
+ set -e; for f in $(APPARMOR_SERVICES); do \
dh_install -p libvirt-daemon-system etc/apparmor.d/$${f}; \
dh_apparmor -p libvirt-daemon-system --profile-name=$${f}; \
done
=====================================
debian/salsa-ci.yml
=====================================
@@ -1,82 +1,21 @@
-stages:
- - build
- - test
+---
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+# libvirt is unfortunately not reproducible at the moment. Upstream work is
+# needed to resolve this issue, and until that happens it's better to keep the
+# reprotest job disabled and avoid pointlessly consuming resources
variables:
- # Default docker image to use
- LV_DOCKER_IMAGE: debian:unstable
- LV_WORKING_DIR: $CI_PROJECT_DIR/debian/output
+ SALSA_CI_DISABLE_REPROTEST: 1
-build-debian-package:
- image: ${LV_DOCKER_IMAGE}
- stage: build
- timeout: 3h
- before_script:
- - echo "man-db man-db/auto-update boolean false" | debconf-set-selections
- - export DEBIAN_FRONTEND=noninteractive
- - apt-get -y update
- - apt-get -y install build-essential git-buildpackage pristine-tar
- - apt-get -y build-dep .
- - git config user.email 'libvirt at example.com'
- - git config user.name 'Gitlab CI'
- script:
- - export DEBEMAIL="$(git config user.email)"
- - UPSTREAM_BRANCH="$(gbp config dch.upstream-branch)"
- - git branch "${UPSTREAM_BRANCH}" "origin/${UPSTREAM_BRANCH}"
- - git branch pristine-tar origin/pristine-tar
- - gbp dch --git-author
- --snapshot
- --commit
- --ignore-branch
- - mkdir -p "${LV_WORKING_DIR}/tarballs"
- - gbp export-orig --tarball-dir="${LV_WORKING_DIR}/tarballs"
- --pristine-tar
- - gbp buildpackage --git-ignore-new
- --git-ignore-branch
- --git-export-dir="${LV_WORKING_DIR}/"
- --git-tarball-dir="${LV_WORKING_DIR}/tarballs"
- -j -b -uc -us > "${LV_WORKING_DIR}/build.log"
- artifacts:
- when: always
- paths:
- - "${LV_WORKING_DIR}/build.log"
- - "${LV_WORKING_DIR}/*.deb"
- - "${LV_WORKING_DIR}/*.buildinfo"
- - "${LV_WORKING_DIR}/*.changes"
-
-lint-debian-package:
- image: ${LV_DOCKER_IMAGE}
- stage: test
- dependencies:
- - build-debian-package
- before_script:
- - echo "man-db man-db/auto-update boolean false" | debconf-set-selections
- - export DEBIAN_FRONTEND=noninteractive
- - apt-get -y update
- - apt-get -y install lintian
- script:
- - ls "${LV_WORKING_DIR}"
- - lintian ${LV_LINTIAN_OPTS} ${LV_WORKING_DIR}/*.changes
-
-autopkgtest-debian-package:
- image: ${LV_DOCKER_IMAGE}
- stage: test
- dependencies:
- - build-debian-package
- before_script:
- - echo "man-db man-db/auto-update boolean false" | debconf-set-selections
- - export DEBIAN_FRONTEND=noninteractive
- - apt-get -y update
- - apt-get -y install autopkgtest
- script:
- - ls "${LV_WORKING_DIR}"
- - RET=0;
- autopkgtest -U ${LV_WORKING_DIR}/*.changes -- autopkgtest-virt-null || RET=$?;
- echo "Autopkgtest exited with ${RET}";
- [ "${RET}" -eq 8 -o "${RET}" -eq 2 ] && exit 0 || exit "${RET}"
+# The cross-build job is currently allowed to fail in the default
+# configuration, but we want to make sure libvirt remains cross-buildable and
+# so we mark it as required instead
+test-crossbuild-arm64:
+ allow_failure: false
verify-wrap-and-sort:
- image: ${LV_DOCKER_IMAGE}
+ image: debian:unstable
stage: test
before_script:
- echo "man-db man-db/auto-update boolean false" | debconf-set-selections
=====================================
debian/source/options
=====================================
@@ -1,3 +1,3 @@
tar-ignore = "debian/gbp.conf"
tar-ignore = "debian/salsa-ci.yml"
-tar-ignore = "debian/scripts/"
+tar-ignore = "debian/scripts"
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/6f439a557e89a72bc2a7a2a66864da15fef2b7cd...81cf04449f01a0acb51769183c150d326781f503
--
View it on GitLab: https://salsa.debian.org/libvirt-team/libvirt/-/compare/6f439a557e89a72bc2a7a2a66864da15fef2b7cd...81cf04449f01a0acb51769183c150d326781f503
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-libvirt-commits/attachments/20211215/1f2a15f0/attachment-0001.htm>
More information about the Pkg-libvirt-commits
mailing list