canonical-hw-cert team mailing list archive

[Paul Larson <mp+430397@xxxxxxxxxxxxxxxxxx>]

Paul Larson has proposed merging ~pwlars/hwcert-jenkins-jobs/+git/cert-juju:add-boshi-blubi into ~canonical-hw-cert/hwcert-jenkins-jobs/+git/cert-juju:master.

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

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

Some new systems for server-cert and a minor fix
-- 
Your team hwcert-jenkins is subscribed to branch ~canonical-hw-cert/hwcert-jenkins-jobs/+git/cert-juju:master.

diff --git a/server-cert/data/blubi/default.yaml b/server-cert/data/blubi/default.yaml
new file mode 100644
index 0000000..eda8531
--- /dev/null
+++ b/server-cert/data/blubi/default.yaml
@@ -0,0 +1,9 @@
+device_ip: 10.245.129.98
+node_id: kk3pfr
+node_name: blubi
+maas_user: server-cert
+agent_name: blubi
+env:
+    HEXR_DEVICE_SECURE_ID: hz6sDsz3JuQfnbRGKyNFY8
+    DEVICE_IP: 10.245.129.98
+    TEST_TARGET_IPERF: 10.1.11.230,10.1.11.235,10.1.11.231,10.1.11.236,10.245.128.3
diff --git a/server-cert/data/blubi/testflinger-agent.conf b/server-cert/data/blubi/testflinger-agent.conf
new file mode 100644
index 0000000..2c8e6ee
--- /dev/null
+++ b/server-cert/data/blubi/testflinger-agent.conf
@@ -0,0 +1,19 @@
+agent_id: blubi
+server_address: https://testflinger.canonical.com
+global_timeout: 172800
+output_timeout: 43200
+
+execution_basedir: /home/ubuntu/testflinger/blubi/run
+logging_basedir: /home/ubuntu/testflinger/blubi/logs
+results_basedir: /home/ubuntu/testflinger/blubi/results
+logging_level: DEBUG
+# logging_quiet: True
+job_queues:
+   - blubi
+
+setup_command: tf-setup
+provision_command: tf-provision
+test_command: tf-test
+reserve_command: tf-reserve
+cleanup_command: tf-cleanup
+provision_type: maas2
diff --git a/server-cert/data/boshi/default.yaml b/server-cert/data/boshi/default.yaml
new file mode 100644
index 0000000..5e1dbd6
--- /dev/null
+++ b/server-cert/data/boshi/default.yaml
@@ -0,0 +1,9 @@
+device_ip: 10.245.129.99
+node_id: 4x8ga4
+node_name: boshi
+maas_user: server-cert
+agent_name: boshi
+env:
+    HEXR_DEVICE_SECURE_ID: XuA6CivPEzuJgEqP2YrNgj
+    DEVICE_IP: 10.245.129.99
+    TEST_TARGET_IPERF: 10.1.11.230,10.1.11.235,10.1.11.231,10.1.11.236,10.245.128.3
diff --git a/server-cert/data/boshi/testflinger-agent.conf b/server-cert/data/boshi/testflinger-agent.conf
new file mode 100644
index 0000000..669dc55
--- /dev/null
+++ b/server-cert/data/boshi/testflinger-agent.conf
@@ -0,0 +1,19 @@
+agent_id: boshi
+server_address: https://testflinger.canonical.com
+global_timeout: 172800
+output_timeout: 43200
+
+execution_basedir: /home/ubuntu/testflinger/boshi/run
+logging_basedir: /home/ubuntu/testflinger/boshi/logs
+results_basedir: /home/ubuntu/testflinger/boshi/results
+logging_level: DEBUG
+# logging_quiet: True
+job_queues:
+   - boshi
+
+setup_command: tf-setup
+provision_command: tf-provision
+test_command: tf-test
+reserve_command: tf-reserve
+cleanup_command: tf-cleanup
+provision_type: maas2
diff --git a/server-cert/data/luma/testflinger-agent.conf b/server-cert/data/luma/testflinger-agent.conf
index ded5214..77727c5 100644
--- a/server-cert/data/luma/testflinger-agent.conf
+++ b/server-cert/data/luma/testflinger-agent.conf
@@ -3,9 +3,9 @@ server_address: https://testflinger.canonical.com
 global_timeout: 172800
 output_timeout: 43200
 
-execution_basedir: /home/ubuntu/testflinger/lumarun
-logging_basedir: /home/ubuntu/testflinger/lumalogs
-results_basedir: /home/ubuntu/testflinger/lumaresults
+execution_basedir: /home/ubuntu/testflinger/luma/run
+logging_basedir: /home/ubuntu/testflinger/luma/logs
+results_basedir: /home/ubuntu/testflinger/luma/results
 logging_level: DEBUG
 # logging_quiet: True
 job_queues:
diff --git a/server-cert/server-cert-agents.yaml b/server-cert/server-cert-agents.yaml
index abf15f2..22cbb6c 100644
--- a/server-cert/server-cert-agents.yaml
+++ b/server-cert/server-cert-agents.yaml
@@ -497,4 +497,20 @@ applications:
     resources:
       testflinger_agent_configfile: data/mouser/testflinger-agent.conf
       device_configfile: data/mouser/default.yaml
+  blubi:
+    charm: ../charms/testflinger-agent-charm
+    num_units: 1
+    to:
+      - server-cert-agent-host
+    resources:
+      testflinger_agent_configfile: data/blubi/testflinger-agent.conf
+      device_configfile: data/blubi/default.yaml
+  boshi:
+    charm: ../charms/testflinger-agent-charm
+    num_units: 1
+    to:
+      - server-cert-agent-host
+    resources:
+      testflinger_agent_configfile: data/boshi/testflinger-agent.conf
+      device_configfile: data/boshi/default.yaml