canonical-hw-cert team mailing list archive

[Kevin Yeh <mp+429578@xxxxxxxxxxxxxxxxxx>]

Kevin Yeh has proposed merging ~kevinyeh/cc-lab-manager:update-charms into cc-lab-manager:master.

Commit message:
Change: use new charms for agent/agenthost.

Requested reviews:
  Canonical Hardware Certification (canonical-hw-cert)

For more details, see:
https://code.launchpad.net/~kevinyeh/cc-lab-manager/+git/cc-lab-manager/+merge/429578
-- 
Your team Canonical Hardware Certification is requested to review the proposed merge of ~kevinyeh/cc-lab-manager:update-charms into cc-lab-manager:master.

diff --git a/cc_lab_manager/gen_config/gen_agent_tf_config.py b/cc_lab_manager/gen_config/gen_agent_tf_config.py
index 365f5f7..f4bddfb 100644
--- a/cc_lab_manager/gen_config/gen_agent_tf_config.py
+++ b/cc_lab_manager/gen_config/gen_agent_tf_config.py
@@ -334,7 +334,7 @@ def create_agent_yaml(db_machine_list, cfg_path):
                 ("agent-host-server-" + lab):{
                     "series": "focal",
                     "constraints": ("tags=cert-agent-host-" + lab),
-                    "charm": "../charms/testflinger-agent-host-charm",
+                    "charm": "testflinger-agent-host",
                     "num_units": 1,
                     "resources":{
                         "ssh_priv_key": "agent-host/id_rsa",
@@ -350,7 +350,7 @@ def create_agent_yaml(db_machine_list, cfg_path):
             if machine['lab'].lower() == lab:
                 agent_name = device_id_to_agent_name(machine["Device_ID"])
                 data["applications"][agent_name] = {
-                    "charm":"../charms/testflinger-agent-charm",
+                    "charm": "testflinger-agent",
                     "num_units": 1,
                     "resources":{
                         "device_configfile":os.path.join('data-' + machine['lab'].lower(), agent_name, 'default.yaml'),