canonical-hw-cert team mailing list archive

[Paolo Gentili <mp+430619@xxxxxxxxxxxxxxxxxx>]

Paolo Gentili has proposed merging ~pgentili/hwcert-jenkins-jobs/+git/cert-juju:zapper-deployer into ~canonical-hw-cert/hwcert-jenkins-jobs/+git/cert-juju:master.

Commit message:
Change: renamed 20220330003-zapper to zapper-20220330003

Requested reviews:
  Kevin Yeh (kevinyeh)

For more details, see:
https://code.launchpad.net/~pgentili/hwcert-jenkins-jobs/+git/cert-juju/+merge/430619

Juju is not happy with application names starting with a number.
-- 
Your team hwcert-jenkins is subscribed to branch ~canonical-hw-cert/hwcert-jenkins-jobs/+git/cert-juju:master.

diff --git a/ce-cert/ce-tf-agents.yaml b/ce-cert/ce-tf-agents.yaml
index 76a4b7c..f47091c 100644
--- a/ce-cert/ce-tf-agents.yaml
+++ b/ce-cert/ce-tf-agents.yaml
@@ -1145,11 +1145,11 @@ applications:
       testflinger_agent_configfile: data/uc22fde001/testflinger-agent.conf
     to:
     - agent-host-server
-  20220330003-zapper:
+  zapper-20220330003:
     charm: ../charms/testflinger-agent-charm
     num_units: 1
     resources:
-      device_configfile: data/20220330003-zapper/default.yaml
-      testflinger_agent_configfile: data/20220330003-zapper/testflinger-agent.conf
+      device_configfile: data/zapper-20220330003/default.yaml
+      testflinger_agent_configfile: data/zapper-20220330003/testflinger-agent.conf
     to:
     - agent-host-server
diff --git a/ce-cert/data/20220330003-zapper/default.yaml b/ce-cert/data/zapper-20220330003/default.yaml
similarity index 95%
rename from ce-cert/data/20220330003-zapper/default.yaml
rename to ce-cert/data/zapper-20220330003/default.yaml
index 9a07489..dfd86f6 100644
--- a/ce-cert/data/20220330003-zapper/default.yaml
+++ b/ce-cert/data/zapper-20220330003/default.yaml
@@ -3,7 +3,7 @@ secure_id: 2AyZUb4uP9UoFVyEMury9K
 # node_id: 
 # maas_user: sru-pool
 logstash_host: 10.101.51.50
-agent_name: 20220330003-zapper
+agent_name: zapper-20220330003
 # node_name: 
 reset_efi: true
 env:
diff --git a/ce-cert/data/20220330003-zapper/testflinger-agent.conf b/ce-cert/data/zapper-20220330003/testflinger-agent.conf
similarity index 76%
rename from ce-cert/data/20220330003-zapper/testflinger-agent.conf
rename to ce-cert/data/zapper-20220330003/testflinger-agent.conf
index 1f9b335..4e768d0 100644
--- a/ce-cert/data/20220330003-zapper/testflinger-agent.conf
+++ b/ce-cert/data/zapper-20220330003/testflinger-agent.conf
@@ -1,10 +1,10 @@
-agent_id: 20220330003-zapper
+agent_id: zapper-20220330003
 server_address: https://testflinger.canonical.com
 global_timeout: 43200
 output_timeout: 3600
-execution_basedir: /home/ubuntu/testflinger/20220330003-zapper/run
-logging_basedir: /home/ubuntu/testflinger/20220330003-zapper/logs
-results_basedir: /home/ubuntu/testflinger/20220330003-zapper/results
+execution_basedir: /home/ubuntu/testflinger/zapper-20220330003/run
+logging_basedir: /home/ubuntu/testflinger/zapper-20220330003/logs
+results_basedir: /home/ubuntu/testflinger/zapper-20220330003/results
 logging_level: INFO
 job_queues:
 - 202203-30003