Merge branch 'release/1.18.0'

debian/changelog

@@ -1,3 +1,11 @@
+edi (1.18.0) mantic; urgency=medium
+
+  [ Matthias Luescher ]
+  * Be careful about removing stuff from the lintian folder.
+  * Implemented --start-at-task option. Closes #86.
+
+ -- Matthias Lüscher (Launchpad) <m.luescher@datacomm.ch>  Fri, 19 Apr 2024 14:43:10 +0200
+
 edi (1.17.0) mantic; urgency=medium
 
   [ Matthias Luescher ]

docs/conf.py

@@ -55,8 +55,8 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.17.0'
-release = '1.17.0'
+version = '1.18.0'
+release = '1.18.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

edi/__init__.py

@@ -56,6 +56,8 @@ def _setup_command_line_interface():
                         help="modify log level (default is WARNING)")
     parser.add_argument('-d', '--debug', action="store_true",
                         help="switch command processing into interactive debug mode (useful for playbook debugging)")
+    parser.add_argument('-s', '--start-at-task', type=str, default="",
+                        help="start the Ansible playbook processing at a given task (useful for playbook debugging)")
 
     subparsers = parser.add_subparsers(title='commands',
                                        dest="command_name")
@@ -77,7 +79,8 @@ def main():
 
         command_name = "{0}.{1}".format(EdiCommand._get_command_name(),
                                         cli_args.command_name)
-        with command_context({'edi_debug_mode': cli_args.debug}):
+        with command_context({'edi_debug_mode': cli_args.debug,
+                              'edi_start_at_task': cli_args.start_at_task}):
             get_command(command_name)().run_cli(cli_args)
     except FatalError as fatal_error:
         print_error_and_exit(fatal_error.message)

edi/lib/configurationparser.py

@@ -99,6 +99,7 @@ class ConfigurationParser:
         'edi_create_distributable_image': False,
         'edi_configure_remote_target': False,
         'edi_debug_mode': False,
+        'edi_start_at_task': "",
     }
 
     @staticmethod
@@ -113,6 +114,10 @@ def configure_remote_target():
     def debug_mode():
         return ConfigurationParser.command_context.get('edi_debug_mode')
 
+    @staticmethod
+    def get_start_task():
+        return ConfigurationParser.command_context.get('edi_start_at_task')
+
     def get_context_suffix(self):
         if self.create_distributable_image():
             return '_di'

edi/lib/playbookrunner.py

@@ -26,14 +26,14 @@
 import tempfile
 import yaml
 from codecs import open
-from edi.lib.helpers import chown_to_user
+from edi.lib.helpers import chown_to_user, FatalError
 from edi.lib.helpers import print_error, get_user, get_workdir
 from edi.lib.shellhelpers import run, require
 from edi.lib.sharedfoldercoordinator import SharedFolderCoordinator
 from edi.lib.configurationparser import remove_passwords
 
 
-class PlaybookRunner():
+class PlaybookRunner:
 
     def __init__(self, config, target, connection):
         self.config = config
@@ -49,7 +49,13 @@ def run_all(self):
             chown_to_user(tempdir)
             inventory = self._write_inventory_file(tempdir)
 
-            for name, path, extra_vars, in self._get_playbooks():
+            collected_playbooks = self._get_playbooks()
+
+            if len(collected_playbooks) > 1 and self.config.get_start_task():
+                raise FatalError("The -s/--start-at-task feature is currently only available for configurations "
+                                 "that contain just one playbook!")
+
+            for name, path, extra_vars, in collected_playbooks:
                 logging.info(("Running playbook {} located in "
                               "{} with extra vars:\n{}"
                               ).format(name, path,
@@ -100,6 +106,11 @@ def _run_playbook(self, playbook, inventory, extra_vars, ansible_user):
         if snap_path not in os.environ['PATH']:
             cmd.extend(["env", "PATH={}:{}".format(os.environ['PATH'], snap_path)])
         cmd.append("ansible-playbook")
+
+        start_task = self.config.get_start_task()
+        if start_task:
+            cmd.extend(["--start-at-task", start_task])
+
         cmd.extend(["--connection", self.connection])
         cmd.extend(["--inventory", inventory])
         cmd.extend(["--extra-vars", "@{}".format(extra_vars)])

edi/lib/versionhelpers.py

@@ -26,7 +26,7 @@
 
 # The do_release script will update this version!
 # During launchpad debuild neither the git version nor the package version is available.
-edi_fallback_version = '1.17.0'
+edi_fallback_version = '1.18.0'
 
 
 def get_edi_version():

edi/plugins/playbooks/debian/base_system/roles/apt_setup/files/remove_documentation

@@ -8,7 +8,7 @@ DPKG_CONTROL_FILE=$1
 find /usr/share/doc -depth -type f ! -name copyright|xargs rm || true
 find /usr/share/doc -empty|xargs rmdir || true
 rm -rf /usr/share/man /usr/share/groff /usr/share/info
-rm -rf /usr/share/lintian /usr/share/linda /var/cache/man
+rm -rf /usr/share/lintian/overrides /usr/share/linda /var/cache/man
 
 cat << EOF > ${DPKG_CONTROL_FILE}
 # save disk space by excluding documentation
@@ -18,7 +18,7 @@ path-include /usr/share/doc/*/copyright
 path-exclude /usr/share/man/*
 path-exclude /usr/share/groff/*
 path-exclude /usr/share/info/*
-path-exclude /usr/share/lintian/*
+path-exclude /usr/share/lintian/overrides/*
 path-exclude /usr/share/linda/*
 EOF
 

edi/plugins/playbooks/debian/base_system/roles/apt_setup/files/remove_documentation_keep_changelog

@@ -8,7 +8,7 @@ DPKG_CONTROL_FILE=$1
 find /usr/share/doc -depth -type f ! -name copyright ! -name changelog.Debian.gz ! -name changelog.gz |xargs rm || true
 find /usr/share/doc -empty|xargs rmdir || true
 rm -rf /usr/share/man /usr/share/groff /usr/share/info
-rm -rf /usr/share/lintian /usr/share/linda /var/cache/man
+rm -rf /usr/share/lintian/overrides /usr/share/linda /var/cache/man
 
 cat << EOF > ${DPKG_CONTROL_FILE}
 # save disk space by excluding documentation
@@ -21,7 +21,7 @@ path-include /usr/share/doc/*/changelog.gz
 path-exclude /usr/share/man/*
 path-exclude /usr/share/groff/*
 path-exclude /usr/share/info/*
-path-exclude /usr/share/lintian/*
+path-exclude /usr/share/lintian/overrides/*
 path-exclude /usr/share/linda/*
 EOF
 

setup.py

@@ -38,7 +38,7 @@
 setup(
     name='edi',
 
-    version='1.17.0',
+    version='1.18.0',
 
     description='Embedded Development Infrastructure - edi',
     long_description=long_description,