Merge pull request #540 from linsword13/lic-merged

Allow licenses section in merged config

Author: douglasjacobsen

lib/ramble/ramble/schema/licenses.py

@@ -44,7 +44,8 @@
     "unset": array_of_strings_or_num,
 }
 
-licenses_schema = {
+#: Properties for inclusion in other schemas
+properties = {
     "licenses": {
         "type": "object",
         "default": {},
@@ -64,5 +65,5 @@
     "title": "Ramble licenses configuration file schema",
     "type": "object",
     "additionalProperties": False,
-    "properties": licenses_schema,
+    "properties": properties,
 }

lib/ramble/ramble/schema/merged.py

@@ -16,6 +16,7 @@
 import ramble.schema.applications
 import ramble.schema.config
 import ramble.schema.formatted_executables
+import ramble.schema.licenses
 import ramble.schema.repos
 import ramble.schema.spack
 import ramble.schema.success_criteria
@@ -30,6 +31,7 @@
     ramble.schema.applications.properties,
     ramble.schema.config.properties,
     ramble.schema.formatted_executables.properties,
+    ramble.schema.licenses.properties,
     ramble.schema.repos.properties,
     ramble.schema.spack.properties,
     ramble.schema.success_criteria.properties,

lib/ramble/ramble/test/end_to_end/merge_config_files.py

@@ -56,6 +56,12 @@ def test_merge_config_files(mutable_config, mutable_mock_workspace_path, mock_ap
   spack:
     packages: {}
     environments: {}
+"""
+    test_licenses = """
+licenses:
+  zlib:
+    set:
+      TEST_LICENSE: 'port@server'
 """
     workspace_name = "test_merge_config_files"
     with ramble.workspace.create(workspace_name) as ws:
@@ -70,15 +76,20 @@ def test_merge_config_files(mutable_config, mutable_mock_workspace_path, mock_ap
 
         applications_file = os.path.join(ws.root, "applications_test.yaml")
         spack_file = os.path.join(ws.root, "spack_test.yaml")
+        licenses_file = os.path.join(ws.root, "licenses.yaml")
 
         with open(applications_file, "w+") as f:
             f.write(test_applications)
 
         with open(spack_file, "w+") as f:
             f.write(test_spack)
 
+        with open(licenses_file, "w") as f:
+            f.write(test_licenses)
+
         config("add", "-f", applications_file, global_args=["-w", workspace_name])
         config("add", "-f", spack_file, global_args=["-w", workspace_name])
+        config("add", "-f", licenses_file, global_args=["-w", workspace_name])
 
         ws._re_read()
 
@@ -88,3 +99,12 @@ def test_merge_config_files(mutable_config, mutable_mock_workspace_path, mock_ap
             assert "test_experiment" in data
             assert "zlib" in data
             assert "spack_spec: [email protected]" in data
+            assert "licenses" in data
+            assert "TEST_LICENSE: port@server" in data
+
+        workspace("setup", "--dry-run", global_args=["-w", workspace_name])
+        exec_file = os.path.join(
+            ws.experiment_dir, "zlib", "ensure_installed", "test_experiment", "execute_experiment"
+        )
+        with open(exec_file) as f:
+            assert "license.inc" in f.read()