From 8bc2e5eb74c5a6c996e380f770909a4bcdc3d0fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 23 Apr 2019 20:53:58 +0200 Subject: [PATCH] Add patch to fix failing test for EPOCHREALTIME bash env [RH:1695953] --- cloud-init-17.1-exclude_EPOCHREALTIME.patch | 31 +++++++++++++++++++++ cloud-init.spec | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 cloud-init-17.1-exclude_EPOCHREALTIME.patch diff --git a/cloud-init-17.1-exclude_EPOCHREALTIME.patch b/cloud-init-17.1-exclude_EPOCHREALTIME.patch new file mode 100644 index 0000000..5e77de4 --- /dev/null +++ b/cloud-init-17.1-exclude_EPOCHREALTIME.patch @@ -0,0 +1,31 @@ +From d1a2fe7307e9cf2251d1f9a666c12d71d3f522d6 Mon Sep 17 00:00:00 2001 +From: Chad Smith +Date: Sat, 26 Jan 2019 15:06:42 +0000 +Subject: opennebula: exclude EPOCHREALTIME as known bash env variable with a + delta + +This branch is needed to allow cloud-init to sbuild on Ubuntu Disco. + +OpenNebula:parse_shell_config tries to do a comparison of bash +environment values, excluding expected environment variables which +are known to change. + +Bash on Ubuntu Disco surfaces a new EPOCHREALTIME environment variable +which wasn't in previous bash environments, this var needs to be +ignored by parse_shell_config too. + +LP: #1813383 + +Index: cloud-init-17.1/cloudinit/sources/DataSourceOpenNebula.py +=================================================================== +--- cloud-init-17.1.orig/cloudinit/sources/DataSourceOpenNebula.py ++++ cloud-init-17.1/cloudinit/sources/DataSourceOpenNebula.py +@@ -279,7 +279,7 @@ def parse_shell_config(content, keylist= + (output, _error) = util.subp(cmd, data=bcmd) + + # exclude vars in bash that change on their own or that we used +- excluded = ("RANDOM", "LINENO", "SECONDS", "_", "__v") ++ excluded = ("EPOCHREALTIME", "RANDOM", "LINENO", "SECONDS", "_", "__v") + preset = {} + ret = {} + target = None diff --git a/cloud-init.spec b/cloud-init.spec index 7bfbecc..881297e 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -23,6 +23,9 @@ Patch3: cloud-init-17.1-no-override-default-network.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1569321 Patch4: cloud-init-17.1-fix-local-ipv4-only.patch +# opennebula: exclude EPOCHREALTIME as known bash env variable with a delta. +Patch5: cloud-init-17.1-exclude_EPOCHREALTIME.patch + BuildArch: noarch BuildRequires: pkgconfig(systemd) @@ -157,6 +160,7 @@ nosetests-%{python3_version} tests/unittests/ %changelog * Tue Apr 23 2019 Björn Esser - 17.1-9 - Fix %%systemd_postun macro [RH:1695953] +- Add patch to fix failing test for EPOCHREALTIME bash env [RH:1695953] * Thu Jan 31 2019 Fedora Release Engineering - 17.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild