From bc275fb74fbb6948246427549f04f0a4323a1747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?=
Date: Thu, 24 Oct 2019 12:29:43 +0200
Subject: [PATCH 13/14] Catch NetworkNoInterfaces error in docker
Hello community,
here is the log from the commit of package vagrant for openSUSE:Factory checked in at 2019-10-31 22:23:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vagrant (Old)
and /work/SRC/openSUSE:Factory/.vagrant.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant"
Thu Oct 31 22:23:56 2019 rev:17 rq:744315 version:2.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/vagrant/vagrant.changes 2019-09-16 10:53:26.215148650 +0200
+++ /work/SRC/openSUSE:Factory/.vagrant.new.2990/vagrant.changes 2019-10-31 22:23:58.976213789 +0100
@@ -1,0 +2,71 @@
+Tue Oct 22 08:30:24 UTC 2019 - Dan Čermák
+
+- Rebased patches:
+
+ - 0001-bin-vagrant-silence-warning-about-installer.patch
+ - 0002-Use-a-private-temporary-dir.patch
+ - 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch
+ - 0004-plugins-don-t-abuse-require_relative.patch.patch
+ - 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch
+ - 0006-do-not-depend-on-wdm.patch
+ - 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch
+ - 0008-Don-t-abuse-relative-paths-in-plugins.patch
+ - 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch
+ - 0010-Skip-failing-tests.patch
+ - 0011-Bump-rspec-its-dependency.patch
+ - 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch
+
+ Dropped (integrated upstream or made obsolete by upstream fixes):
+ - 0013-Only-return-interfaces-where-addr-is-not-nil.patch
+ - 0014-Skip-docker-networking-test.patch
+
+ Removed:
+ - 0015-ARM-only-Disable-Subprocess-unit-test.patch
+
+ Added:
+ - 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch
+ - 0014-ARM-only-Disable-Subprocess-unit-test.patch
+
+ This update fixes boo#1150592
+
+-------------------------------------------------------------------
+Fri Oct 18 06:31:22 UTC 2019 - Johannes Kastl
+
+- update to 2.2.6
+ - dropped patch 0013-Only-return-interfaces-where-addr-is-not-nil.patch that has been included upstream
+ - set vagrant_cloud dependency to >= 2.0.3
+
+ FEATURES:
+ core/provisioners: Introduce new Provisioner options: before and after [GH-11043]
+ guest/alpine: Integrate the vagrant-alpine plugin into Vagrant core [GH-10975]
+
+ IMPROVEMENTS:
+ command/box/prune: Allow prompt skip while preserving actively in use boxes [GH-10908]
+ command/cloud: Support providing checksum information with boxes [GH-11101]
+ dev: Fixed Vagrantfile for Vagrant development [GH-11012]
+ guest/alt: Improve handling for using network tools when setting hostname [GH-11000]
+ guest/suse: Add ipv6 network config templates for SUSE based distributions [GH-11013]
+ guest/windows: Retry on connection timeout errors for the reboot capability [GH-11093]
+ host/bsd: Use host resolve path capability to modify local paths if requird [GH-11108]
+ host/darwin: Add host resolve path capability to provide real paths for firmlinks [GH-11108]
+ provisioners/chef: Update pkg install flags for chef on FreeBSD guests [GH-11075]
+ provider/hyperv: Improve error message when VMMS is not running [GH-10978]
+ provider/virtualbox: Raise additional errors for incomplete virtualbox installation on usable check [GH-10938]
+ util/filechecksum: Add support for more checksum types [GH-11101]
+
+ BUG FIXES:
+ command/rsync-auto: Fix path watcher bug so that all subdirectories are synced when changed [GH-11089]
+ command/snapshot/save: Ensure VM id is passed to list snapshots for hyper-v provider [GH-11097]
+ core: Ensure proper paths are shown in config loading exceptions [GH-11056]
+ guest/suse: Use hostnamectl instead of hostname to set the hostname under SUSE [GH-11100]
+ provider/docker: Fix default provider validation if password is used [GH-11053]
+ provider/docker: Fix Docker providers usable? check [GH-11068]
+ provisioner/ansible_local: Ensure pip_install_cmd is finalized to emptry string [GH-11098]
+ provisioner/file: Ensure relative path for file provisioner source is relative to guest machines cwd [GH-11099]
+ provider/docker: Ensure docker build_args option is properly set in docker compose config yaml [GH-11106]
+ guest/suse: Update nfs & service daemon names for suse based hosts and guests [GH-11076]
+ provider/docker: Determine ip address prefix workaround for docker public networks [GH-11111]
+ provider/docker: Only return interfaces where addr is not nil for networks [GH-11116]
+
+
+-------------------------------------------------------------------
Old:
----
0013-Only-return-interfaces-where-addr-is-not-nil.patch
0014-Skip-docker-networking-test.patch
0015-ARM-only-Disable-Subprocess-unit-test.patch
vagrant-2.2.5.tar.gz
New:
----
0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch
0014-ARM-only-Disable-Subprocess-unit-test.patch
vagrant-2.2.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vagrant.spec ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.296215567 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.300215573 +0100
@@ -26,12 +26,12 @@
Name: vagrant
-Version: 2.2.5
+Version: 2.2.6
Release: 0
Summary: Tool for building and distributing virtualized development environments
License: MIT
Group: Development/Languages/Ruby
-Url: https://github.com/hashicorp/vagrant
+URL: https://github.com/hashicorp/vagrant
Source0: %{URL}/archive/v%{version}/%{name}-%{version}.tar.gz
Source11: vagrant.1
Source93: vagrant_transfiletriggerin.rb
@@ -62,10 +62,8 @@
Patch11: 0011-Bump-rspec-its-dependency.patch
# https://github.com/hashicorp/vagrant/pull/10945
Patch12: 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch
-# https://github.com/hashicorp/vagrant/pull/10993
-Patch13: 0013-Only-return-interfaces-where-addr-is-not-nil.patch
-Patch14: 0014-Skip-docker-networking-test.patch
-Patch15: 0015-ARM-only-Disable-Subprocess-unit-test.patch
+Patch13: 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch
+Patch14: 0014-ARM-only-Disable-Subprocess-unit-test.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -85,9 +83,9 @@
# Build dependencies
#===============================================================================
-# s.required_ruby_version = "~> 2.2", "< 2.7"
+# s.required_ruby_version = "~> 2.4", "< 2.7"
BuildRequires: %{ruby < 2.7}
-BuildRequires: %{ruby:2 >= 2.2}
+BuildRequires: %{ruby:2 >= 2.4}
#
#
#
@@ -130,8 +128,8 @@
BuildRequires: %{rubygem winrm-fs:1 }
# s.add_dependency "winrm-elevated", "~> 1.1"
BuildRequires: %{rubygem winrm-elevated:1 >= 1.1 }
-# s.add_dependency "vagrant_cloud", "~> 2.0.2"
-BuildRequires: %{rubygem vagrant_cloud:2.0 >= 2.0.2 }
+# s.add_dependency "vagrant_cloud", "~> 2.0.3"
+BuildRequires: %{rubygem vagrant_cloud:2.0 >= 2.0.3 }
# devel dependencies:
# s.add_development_dependency "rake", "~> 12.0.0"
@@ -212,8 +210,8 @@
Requires: %{rubygem winrm-fs:1}
# s.add_dependency "winrm-elevated", "~> 1.1"
Requires: %{rubygem winrm-elevated:1 >= 1.1}
-# s.add_dependency "vagrant_cloud", "~> 2.0.2"
-Requires: %{rubygem vagrant_cloud:2.0 >= 2.0.2}
+# s.add_dependency "vagrant_cloud", "~> 2.0.3"
+Requires: %{rubygem vagrant_cloud:2.0 >= 2.0.3}
# s.add_dependency "ruby_dep", "<= 1.3.1"
Requires: %{rubygem ruby_dep <= 1.3.1 }
@@ -289,10 +287,9 @@
%patch11 -p 1
%patch12 -p 1
%patch13 -p 1
-%patch14 -p 1
# disable the subprocess test only on ARM
-%ifarch %{arm}
-%patch15 -p 1
+%ifarch %{arm} aarch64
+%patch14 -p 1
%endif
cp %{SOURCE98} .
++++++ 0001-bin-vagrant-silence-warning-about-installer.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.400215708 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.400215708 +0100
@@ -1,7 +1,7 @@
-From 82737fbe42f96385ed56b9a57044ddb78b96a681 Mon Sep 17 00:00:00 2001
+From e1a0054ceecffce9b3ef389d5b4b9bf85f309351 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro
Date: Sat, 11 Oct 2014 16:54:58 -0300
-Subject: [PATCH 01/15] bin/vagrant: silence warning about installer
+Subject: [PATCH 01/14] bin/vagrant: silence warning about installer
Signed-off-by: Johannes Kastl
---
@@ -36,5 +36,5 @@
#
# Unset - Disables experimental features
--
-2.22.1
+2.23.0
++++++ 0002-Use-a-private-temporary-dir.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.504215848 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.528215880 +0100
@@ -1,7 +1,7 @@
-From e9ed3c9a50bffb33ff5070ae6a34b50543d299d2 Mon Sep 17 00:00:00 2001
+From 2e3ac8696235e4239977c10e78474de1b1cbccd8 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro
Date: Wed, 22 Oct 2014 09:40:14 -0200
-Subject: [PATCH 02/15] Use a private temporary dir
+Subject: [PATCH 02/14] Use a private temporary dir
Without this vagrant will clutter $TMPDIR with dozens of even hundreds
of temporary files (~4 per vagrant invocation).
@@ -94,5 +94,5 @@
+ FileUtils.rm_rf(Vagrant::Util::Tempfile.private_tmpdir)
+end
--
-2.22.1
+2.23.0
++++++ 0003-linux-cap-halt-don-t-wait-for-shutdown-h-now-to-fini.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.568215934 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.572215939 +0100
@@ -1,7 +1,7 @@
-From 1ea744cf22640883f1b280aa98d02a163a328f2c Mon Sep 17 00:00:00 2001
+From 5323b2746d765bee3fd9aa739bf3d0e120eb1874 Mon Sep 17 00:00:00 2001
From: Antonio Terceiro
Date: Tue, 3 Feb 2015 10:35:17 -0200
-Subject: [PATCH 03/15] linux/cap/halt: don't wait for `shutdown -h now` to
+Subject: [PATCH 03/14] linux/cap/halt: don't wait for `shutdown -h now` to
finish
When running a Debian 8 lxc guest (with the vagrant-lxc plugin), which
@@ -27,5 +27,5 @@
# Do nothing, because it probably means the machine shut down
# and SSH connection was lost.
--
-2.22.1
+2.23.0
++++++ 0004-plugins-don-t-abuse-require_relative.patch.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.612215993 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.616215998 +0100
@@ -1,7 +1,7 @@
-From f840574ea47230fbdc77d510898050bf0eaae7ac Mon Sep 17 00:00:00 2001
+From 399ed85dc12e70156c6fa40a49e35110ad6fcff4 Mon Sep 17 00:00:00 2001
From: Johannes Kastl
Date: Wed, 17 May 2017 09:09:57 +0200
-Subject: [PATCH 04/15] plugins-don-t-abuse-require_relative.patch
+Subject: [PATCH 04/14] plugins-don-t-abuse-require_relative.patch
Signed-off-by: Johannes Kastl
---
@@ -154,5 +154,5 @@
module VagrantPlugins
module GuestSUSE
--
-2.22.1
+2.23.0
++++++ 0005-fix-vbox-package-boo-1044087-added-by-robert.muntean.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.660216058 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.660216058 +0100
@@ -1,7 +1,7 @@
-From 63f9c59d213cea81ce5a509d2d1ecadd7a48dc64 Mon Sep 17 00:00:00 2001
+From ccaab429a383ff048400a866f3aa77409ae4976d Mon Sep 17 00:00:00 2001
From: Johannes Kastl
Date: Fri, 16 Nov 2018 21:12:43 +0100
-Subject: [PATCH 05/15] fix vbox package boo#1044087, added by
+Subject: [PATCH 05/14] fix vbox package boo#1044087, added by
robert.munteanu@gmail.com on Sun Aug 13 19:07:06 UTC 2017
Signed-off-by: Johannes Kastl
@@ -33,5 +33,5 @@
module VagrantPlugins
module ProviderVirtualBox
--
-2.22.1
+2.23.0
++++++ 0006-do-not-depend-on-wdm.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.700216112 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.700216112 +0100
@@ -1,7 +1,7 @@
-From 9d85efab05e3b73ae23e24b67372cbffe033349c Mon Sep 17 00:00:00 2001
+From 98c990b8b57849464a4e1773689635a2328da89e Mon Sep 17 00:00:00 2001
From: Johannes Kastl
Date: Mon, 4 Jun 2018 09:18:23 +0200
-Subject: [PATCH 06/15] do not depend on wdm
+Subject: [PATCH 06/14] do not depend on wdm
Signed-off-by: Johannes Kastl
---
@@ -9,7 +9,7 @@
1 file changed, 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
-index 885c0d359..d3584c610 100644
+index 2ca4a6972..c7a2d436c 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
@@ -21,5 +21,5 @@
s.add_dependency "winrm-fs", "~> 1.0"
s.add_dependency "winrm-elevated", "~> 1.1"
--
-2.22.1
+2.23.0
++++++ 0007-do-not-abuse-relative-paths-in-docker-plugin-to-make.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.732216155 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.736216160 +0100
@@ -1,7 +1,7 @@
-From 70837c27d8d2be474ed2dd7239fd39beae4d8250 Mon Sep 17 00:00:00 2001
+From 63325a25be5349141e628f4d8738cd66cf2eff69 Mon Sep 17 00:00:00 2001
From: Johannes Kastl
Date: Fri, 16 Nov 2018 21:14:46 +0100
-Subject: [PATCH 07/15] do not abuse relative paths in docker plugin to make
+Subject: [PATCH 07/14] do not abuse relative paths in docker plugin to make
docker work, added by tmkn@tmkn.uk on Thu Oct 26 19:42:46 UTC 2017
Signed-off-by: Johannes Kastl
@@ -22,5 +22,5 @@
module VagrantPlugins
module DockerProvider
--
-2.22.1
+2.23.0
++++++ 0008-Don-t-abuse-relative-paths-in-plugins.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.756216187 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.784216225 +0100
@@ -1,7 +1,7 @@
-From 461907e06abd3f2f4ca426edae7a8f90cc9fcd8e Mon Sep 17 00:00:00 2001
+From 6cabd408fd06b60b0b0c74c93da9fea05e8b0339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?=
Date: Fri, 11 Jan 2019 12:32:28 +0100
-Subject: [PATCH 08/15] Don't abuse relative paths in plugins
+Subject: [PATCH 08/14] Don't abuse relative paths in plugins
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -64,5 +64,5 @@
require_relative "../installer"
--
-2.22.1
+2.23.0
++++++ 0009-Fix-unit-tests-for-GuestLinux-Cap-Halt.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.844216305 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.860216327 +0100
@@ -1,7 +1,7 @@
-From bd5d63abbba0294bea738ddb497b59703ce67fea Mon Sep 17 00:00:00 2001
+From e1eaa4583e58d802f0c2339c959b5becb6a2c49f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?=
Date: Thu, 14 Mar 2019 00:25:05 +0100
-Subject: [PATCH 09/15] Fix unit tests for GuestLinux::Cap::Halt
+Subject: [PATCH 09/14] Fix unit tests for GuestLinux::Cap::Halt
This test fails since we patch `shutdown -h now` to be `shutdown -h now &`
instead.
@@ -37,5 +37,5 @@
cap.halt(machine)
}.to_not raise_error
--
-2.22.1
+2.23.0
++++++ 0010-Skip-failing-tests.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.964216467 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.964216467 +0100
@@ -1,7 +1,7 @@
-From 651b60680822c89c6892163497a864b47aadaccf Mon Sep 17 00:00:00 2001
+From 85808a200ea1a95f00edc2af816ae3f124dc1962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?=
Date: Mon, 1 Apr 2019 17:28:31 +0200
-Subject: [PATCH 10/15] Skip failing tests
+Subject: [PATCH 10/14] Skip failing tests
---
test/unit/bin/vagrant_test.rb | 4 ++--
@@ -30,5 +30,5 @@
end
end
--
-2.22.1
+2.23.0
++++++ 0011-Bump-rspec-its-dependency.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:00.992216505 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:00.992216505 +0100
@@ -1,14 +1,14 @@
-From cb44bcc57e743c6fb5cd983de616681ba0b528f4 Mon Sep 17 00:00:00 2001
+From 79bdf20d3c293293730548f20e329f3c726f5091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?=
Date: Wed, 17 Jul 2019 10:59:07 +0200
-Subject: [PATCH 11/15] Bump rspec-its dependency
+Subject: [PATCH 11/14] Bump rspec-its dependency
---
vagrant.gemspec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vagrant.gemspec b/vagrant.gemspec
-index d3584c610..029994a91 100644
+index c7a2d436c..04561f9c9 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
@@ -21,5 +21,5 @@
s.add_development_dependency "fake_ftp", "~> 0.1.1"
--
-2.22.1
+2.23.0
++++++ 0012-Do-not-list-load-dependencies-if-vagrant-spec-is-not.patch ++++++
--- /var/tmp/diff_new_pack.E75qnI/_old 2019-10-31 22:24:01.000216516 +0100
+++ /var/tmp/diff_new_pack.E75qnI/_new 2019-10-31 22:24:01.000216516 +0100
@@ -1,7 +1,7 @@
-From 2a34db55059236e16d62a85c9dbceed7b5ce28b2 Mon Sep 17 00:00:00 2001
+From 7784ec13f12752f5b73ddec371cb73b6dd97615a Mon Sep 17 00:00:00 2001
From: Pavel Valena
Date: Mon, 1 Jul 2019 17:44:54 +0200
-Subject: [PATCH 12/15] Do not list / load dependencies if `vagrant` spec is
+Subject: [PATCH 12/14] Do not list / load dependencies if `vagrant` spec is
not loaded
in `vagrant_internal_specs` as this fails, due to `find` returning `nil`.
@@ -26,5 +26,5 @@
list = {}
directories = [Gem::Specification.default_specifications_dir]
--
-2.22.1
+2.23.0
++++++ 0013-Catch-NetworkNoInterfaces-error-in-docker-prepare_ne.patch ++++++
prepare_networks_test
The test "generates a network name and configuration" calls at the end
`process_public_network()`, which can return an empty list if the currently
executing machine has no usable network interfaces (this is typically the case
for workers that build rpm packages in OBS or Koji). This results in an
exception of type Errors::NetworkNoInterfaces to be thrown and causing this test
to fail.
This commit wraps this call in a rescue block to supress this failure.
---
.../providers/docker/action/prepare_networks_test.rb | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/test/unit/plugins/providers/docker/action/prepare_networks_test.rb b/test/unit/plugins/providers/docker/action/prepare_networks_test.rb
index 524db9533..3461c3e05 100644
--- a/test/unit/plugins/providers/docker/action/prepare_networks_test.rb
+++ b/test/unit/plugins/providers/docker/action/prepare_networks_test.rb
@@ -1,5 +1,6 @@
require_relative "../../../../base"
require_relative "../../../../../../plugins/providers/docker/action/prepare_networks"
+require_relative "../../../../../../plugins/providers/docker/errors"
describe VagrantPlugins::DockerProvider::Action::PrepareNetworks do
include_context "unit"
@@ -343,8 +344,12 @@ describe VagrantPlugins::DockerProvider::Action::PrepareNetworks do
allow(driver).to receive(:network_containing_address).
with("10.1.10.2").and_return("vagrant_network_public")
- network_name, network_options = subject.process_public_network(options, {}, env)
- expect(network_name).to eq("vagrant_network_public")
+ begin
+ network_name, network_options = subject.process_public_network(options, {}, env)
+ expect(network_name).to eq("vagrant_network_public")
+ rescue VagrantPlugins::DockerProvider::Errors::NetworkNoInterfaces
+ # we are running inside a VM without valid network interfaces
+ end
end
end
--
2.23.0
++++++ 0015-ARM-only-Disable-Subprocess-unit-test.patch -> 0014-ARM-only-Disable-Subprocess-unit-test.patch ++++++
--- /work/SRC/openSUSE:Factory/vagrant/0015-ARM-only-Disable-Subprocess-unit-test.patch 2019-09-16 10:53:25.291148769 +0200
+++ /work/SRC/openSUSE:Factory/.vagrant.new.2990/0014-ARM-only-Disable-Subprocess-unit-test.patch 2019-10-31 22:23:58.904213692 +0100
@@ -1,7 +1,7 @@
-From 5ef42f64f34af7eb97f22dafdf73126fcdb2c90e Mon Sep 17 00:00:00 2001
+From 751a501fa2952f78d60085272dafc96a97d95cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?=
Date: Wed, 28 Aug 2019 13:39:58 +0200
-Subject: [PATCH 15/15] [ARM only] Disable Subprocess unit test
+Subject: [PATCH 14/14] [ARM only] Disable Subprocess unit test
This unit test is *very* flaky on OBS' ARM workers and causes random build
failures. These are probably caused by worker being under high load and then
@@ -33,5 +33,5 @@
sleep(0.1)
expect(sp.stop).to be(true)
--
-2.22.1
+2.23.0
++++++ vagrant-2.2.5.tar.gz -> vagrant-2.2.6.tar.gz ++++++
++++ 4846 lines of diff (skipped)