curtin-dev team mailing list archive

[Olivier Gayot <mp+485548@xxxxxxxxxxxxxxxxxx>]

Olivier Gayot has proposed merging ~ogayot/curtin:noble-fix-ci into curtin:ubuntu/noble.

Requested reviews:
  curtin developers (curtin-dev)

For more details, see:
https://code.launchpad.net/~ogayot/curtin/+git/curtin/+merge/485548

Fix the CI on noble
-- 
Your team curtin developers is requested to review the proposed merge of ~ogayot/curtin:noble-fix-ci into curtin:ubuntu/noble.

diff --git a/curtin/block/iscsi.py b/curtin/block/iscsi.py
index 3c46500..3cceddd 100644
--- a/curtin/block/iscsi.py
+++ b/curtin/block/iscsi.py
@@ -202,7 +202,6 @@ def save_iscsi_config(iscsi_disk):
 
 
 def ensure_disk_connected(rfc4173, write_config=True):
-    global _ISCSI_DISKS
     iscsi_disk = _ISCSI_DISKS.get(rfc4173)
     if not iscsi_disk:
         iscsi_disk = IscsiDisk(rfc4173)
@@ -226,7 +225,6 @@ def ensure_disk_connected(rfc4173, write_config=True):
 
 
 def connected_disks():
-    global _ISCSI_DISKS
     return _ISCSI_DISKS
 
 
diff --git a/curtin/distro.py b/curtin/distro.py
index 56a80bb..3382255 100644
--- a/curtin/distro.py
+++ b/curtin/distro.py
@@ -64,7 +64,6 @@ def lsb_release(target=None):
         # do not use or update cache if target is provided
         return _lsb_release(target)
 
-    global _LSB_RELEASE
     if not _LSB_RELEASE:
         data = _lsb_release()
         _LSB_RELEASE.update(data)
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 09c4c21..578fa47 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -180,7 +180,6 @@ def sync_images(src_url, base_dir, filters, verbosity=0):
     # do a sync with provided filters
 
     # only sync once per set of filters.  global IMAGE_SYNCS manages that.
-    global IMAGE_SYNCS
     sfilters = ','.join(sorted(filters))
 
     if sfilters in IMAGE_SYNCS:
@@ -2374,7 +2373,6 @@ def apply_keep_settings(success=None, fail=None):
                 raise ValueError("'%s' had invalid token '%s'" % (ename, name))
         data[dname] = toks
 
-    global KEEP_DATA
     KEEP_DATA.update(data)