New upstream version 1.58~rc1 upstream/1.58_rc1

2 files changed, 19 insertions, 0 deletions

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 4ef3ff9e..7aef02aa 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -77,6 +77,18 @@ variables:
   {{"%-13s"| format(distro_group.name.upper() + '_EXEC:')}}'bash .gitlab-ci/{{base_types[distro_group.name]}}-install.sh'
 {% endfor %}
 
+# Retry only on transient infrastructure failures. script_failure is
+# intentionally excluded so real (and flaky) test failures stay visible.
+default:
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+      - stuck_or_timeout_failure
+      - scheduler_failure
+      - api_failure
+      - unknown_failure
+
 .nm_artifacts:
   variables:
     NM_BUILD_TARBALL: 1
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 737d4052..f46323fb 100755
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -31,6 +31,13 @@ if [ $IS_DEBIAN_9 = 1 -o $IS_UBUNTU_18_04 = 1 ]; then
     ln -sf /bin/true /usr/bin/chfn
 fi
 
+# The udev postinst runs systemd-tmpfiles, which fails to chown the
+# read-only /dev/kvm, /dev/vhost-* nodes the CI runner exposes. We only
+# need udev for its pkgconfig file, not the daemon; mask the offending
+# tmpfiles so the postinst succeeds.
+mkdir -p /etc/tmpfiles.d
+: > /etc/tmpfiles.d/static-nodes-permissions.conf
+
 DEBIAN_FRONTEND=noninteractive apt-get update
 DEBIAN_FRONTEND=noninteractive NM_INSTALL="apt-get --yes install" bash -x ./contrib/debian/REQUIRED_PACKAGES