New config options for injecting extra packages. refs: #52

ARPA-SIMC · Aug 15, 2022 · bdcc1f0 · bdcc1f0
1 parent 635d9ce
commit bdcc1f0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/doc/moncic-ci-config.md b/doc/moncic-ci-config.md
@@ -43,3 +43,5 @@ The only keyword currently supported is:
   snapshots. Default: false, or true if OS images are not on btrfs
 * `debcachedir: str` Directory where `.deb` files are cached between
   invocations. Default: `~/.cache/moncic-ci/debs`
+* `extra_packages_dir`: Directory where extra packages, if present, are added
+  to package sources in containers. Default: None
diff --git a/moncic/ci.py b/moncic/ci.py
@@ -74,6 +74,9 @@ def make_subparser(cls, subparsers):
                             help="path to the Moncic-CI config file to use. By default,"
                                  " look in a number of well-known locations, see"
                                  " https://github.com/ARPA-SIMC/moncic-ci/blob/main/doc/moncic-ci-config.md")
+        parser.add_argument("--extra-packages-dir", action="store",
+                            help="directory where extra packages, if presemt, are added to package sources"
+                                 " in containers")
         return parser
 
     def __init__(self, args):

diff --git a/moncic/moncic.py b/moncic/moncic.py
@@ -32,7 +32,10 @@ class MoncicConfig:
     # Use a tmpfs overlay for ephemeral containers instead of btrfs snapshots
     tmpfs: bool = False
     # Directory where .deb files are cached between invocations
-    debcachedir: str = "~/.cache/moncic-ci/debs"
+    debcachedir: Optional[str] = "~/.cache/moncic-ci/debs"
+    # Directory where extra packages, if present, are added to package sources
+    # in containers
+    extra_packagages_dir: Optional[str] = None
 
     def __post_init__(self):
         # Allow to use ~ in config files