compute-image-packages: remove no-infinite-loop patch
The retry loop this patch removes is necessary and breaks
the google-accounts-daemon in certain cases.
The google-instance-setup.service has "After=network-online.target"
which should be sufficient to block it in case network is unavailable
since we have disabled timeout in systemd-networkd-wait-online target.
BUG=b:35272718
TEST=trybots (kvm & gce tests)
Change-Id: I7670ef35f5d377b183144b3dc331497dae5641a6
Previous-Reviewed-on: https://chromium-review.googlesource.com/441935
(cherry picked from commit febf80383328ab12ccbbf39cfa45a56aa020638d)
Reviewed-on: https://chromium-review.googlesource.com/442057
Reviewed-by: Andrey Ulanov <andreyu@google.com>
Commit-Queue: Aditya Kali <adityakali@google.com>
Tested-by: Aditya Kali <adityakali@google.com>
(cherry picked from commit 4a6cf96028e117ccb867e1010b9c0034bec6fbda)
Reviewed-on: https://chromium-review.googlesource.com/444845
diff --git a/overlay-lakitu/app-admin/compute-image-packages/compute-image-packages-20160930-r8.ebuild b/overlay-lakitu/app-admin/compute-image-packages/compute-image-packages-20160930-r8.ebuild
new file mode 120000
index 0000000..2bf2ce2
--- /dev/null
+++ b/overlay-lakitu/app-admin/compute-image-packages/compute-image-packages-20160930-r8.ebuild
@@ -0,0 +1 @@
+compute-image-packages-20160930.ebuild
\ No newline at end of file
diff --git a/overlay-lakitu/app-admin/compute-image-packages/compute-image-packages-20160930.ebuild b/overlay-lakitu/app-admin/compute-image-packages/compute-image-packages-20160930.ebuild
index 5a871b0..fce5992 100644
--- a/overlay-lakitu/app-admin/compute-image-packages/compute-image-packages-20160930.ebuild
+++ b/overlay-lakitu/app-admin/compute-image-packages/compute-image-packages-20160930.ebuild
@@ -28,7 +28,6 @@
"
python_prepare_all() {
- epatch "${FILESDIR}/metadata-watcher-no-infinite-loop.patch"
epatch "${FILESDIR}/execute-startup-scripts-from-var-lib-google.patch"
epatch "${FILESDIR}/set-ethtool-to-usr-sbin.patch"
epatch "${FILESDIR}/catch-read-only-root-fs.patch"
diff --git a/overlay-lakitu/app-admin/compute-image-packages/files/metadata-watcher-no-infinite-loop.patch b/overlay-lakitu/app-admin/compute-image-packages/files/metadata-watcher-no-infinite-loop.patch
deleted file mode 100644
index d521828..0000000
--- a/overlay-lakitu/app-admin/compute-image-packages/files/metadata-watcher-no-infinite-loop.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit d9311fffa36dfe12ac12f81c778c1c8d95e43c57
-Author: Ke Wu <mikewu@google.com>
-Date: Tue Nov 8 15:26:32 2016 -0800
-
- metadata_watcher.py: avoid keeping trying to connnect to metadata service
-
- When ran on KVM, google-instance-setup.service (which is a oneshot
- agent) keeps trying to connect to the metadata service which is
- inaccessible during VM_Test of lakitu. It makes
- google-instance-setup.service ends in an infinite loop and can't
- finish the setup. Skip the loop completely.
-
-diff --git a/google_compute_engine/metadata_watcher.py b/google_compute_engine/metadata_watcher.py
-index e7da49b..b85a15f 100644
---- a/google_compute_engine/metadata_watcher.py
-+++ b/google_compute_engine/metadata_watcher.py
-@@ -152,17 +152,13 @@ class MetadataWatcher(object):
- Returns:
- json, the deserialized contents of the metadata server.
- """
-- exception = None
- while True:
- try:
- return self._GetMetadataUpdate(
- metadata_key=metadata_key, recursive=recursive, wait=wait)
- except (httpclient.HTTPException, socket.error, urlerror.URLError) as e:
-- if isinstance(e, type(exception)):
-- continue
-- else:
-- exception = e
-- self.logger.exception('GET request error retrieving metadata.')
-+ self.logger.exception('GET request error retrieving metadata. %s.', e)
-+ break
-
- def WatchMetadata(self, handler, metadata_key='', recursive=True):
- """Watch for changes to the contents of the metadata server.
