WIP print container setup

golemfactory · Jun 21, 2023 · 1b5e79c · 1b5e79c
1 parent 260803f
commit 1b5e79c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/goth_tests/e2e/vm/test_e2e_rule_partner_outbound.py b/goth_tests/e2e/vm/test_e2e_rule_partner_outbound.py
@@ -42,17 +42,18 @@ async def test_e2e_rule_partner_outbound(
         {"name": "provider-1", "type": "VM-Wasm-Provider", "address": "63fc2ad3d021a4d7e64323529a55a9442c444da0", "use-proxy": True},
     ]
 
+    assets_root = Path(__file__).parent / "assets";
     node_types = [
        {"name": "Requestor", "class": "goth.runner.probe.RequestorProbe"},
        {
          "name": "VM-Wasm-Provider",
          "class": "goth.runner.probe.ProviderProbe",
          "mount": [
-              {"read-only": "assets/provider/presets.json", "destination": "/root/.local/share/ya-provider/presets.json"},
-              {"read-only": "assets/provider/hardware.json", "destination": "/root/.local/share/ya-provider/hardware.json"},
+              {"read-only": "provider/presets.json", "destination": "/root/.local/share/ya-provider/presets.json"},
+              {"read-only": "provider/hardware.json", "destination": "/root/.local/share/ya-provider/hardware.json"},
               {"read-write": "~/.local/share/ya-provider/vm-images", "destination": "/root/.local/share/ya-provider/exe-unit/cache"},
-              {"read-write": "e2e/vm/assets/test_e2e_rule_partner_outbound/provider/cert-dir", "destination": "/root/.local/share/ya-provider/cert-dir"},
-              {"read-write": "e2e/vm/assets/test_e2e_rule_partner_outbound/provider/rules.json", "destination": "/root/.local/share/ya-provider/rules.json"},
+              {"read-write": f"{assets_root}/test_e2e_rule_partner_outbound/provider/cert-dir", "destination": "/root/.local/share/ya-provider/cert-dir"},
+              {"read-write": f"{assets_root}/test_e2e_rule_partner_outbound/provider/rules.json", "destination": "/root/.local/share/ya-provider/rules.json"},
          ],
          "privileged-mode": True,
        },
@@ -63,6 +64,8 @@ async def test_e2e_rule_partner_outbound(
 
     goth_config = load_yaml(default_config, config_overrides)
 
+    logger.info("Container setup: %s", goth_config.containers)
+
     runner = Runner(
         base_log_dir=log_dir,
         compose_config=goth_config.compose_config,

diff --git a/goth_tests/e2e/vm/test_e2e_rule_partner_outbound_unrestricted.py b/goth_tests/e2e/vm/test_e2e_rule_partner_outbound_unrestricted.py
@@ -42,17 +42,18 @@ async def test_e2e_rule_partner_outbound_unrestricted(
         {"name": "provider-1", "type": "VM-Wasm-Provider", "address": "63fc2ad3d021a4d7e64323529a55a9442c444da0", "use-proxy": True},
     ]
 
+    assets_root = Path(__file__).parent / "assets";
     node_types = [
        {"name": "Requestor", "class": "goth.runner.probe.RequestorProbe"},
        {
          "name": "VM-Wasm-Provider",
          "class": "goth.runner.probe.ProviderProbe",
          "mount": [
-              {"read-only": "assets/provider/presets.json", "destination": "/root/.local/share/ya-provider/presets.json"},
-              {"read-only": "assets/provider/hardware.json", "destination": "/root/.local/share/ya-provider/hardware.json"},
+              {"read-only": "provider/presets.json", "destination": "/root/.local/share/ya-provider/presets.json"},
+              {"read-only": "provider/hardware.json", "destination": "/root/.local/share/ya-provider/hardware.json"},
               {"read-write": "~/.local/share/ya-provider/vm-images", "destination": "/root/.local/share/ya-provider/exe-unit/cache"},
-              {"read-write": "e2e/vm/assets/test_e2e_rule_partner_outbound/provider/cert-dir", "destination": "/root/.local/share/ya-provider/cert-dir"},
-              {"read-write": "e2e/vm/assets/test_e2e_rule_partner_outbound/provider/rules.json", "destination": "/root/.local/share/ya-provider/rules.json"},
+              {"read-write": f"{assets_root}/test_e2e_rule_partner_outbound/provider/cert-dir", "destination": "/root/.local/share/ya-provider/cert-dir"},
+              {"read-write": f"{assets_root}/test_e2e_rule_partner_outbound/provider/rules.json", "destination": "/root/.local/share/ya-provider/rules.json"},
          ],
          "privileged-mode": True,
        },
@@ -63,6 +64,8 @@ async def test_e2e_rule_partner_outbound_unrestricted(
 
     goth_config = load_yaml(default_config, config_overrides)
 
+    logger.info("Container setup: %s", goth_config.containers)
+
     runner = Runner(
         base_log_dir=log_dir,
         compose_config=goth_config.compose_config,