From: Kienan Stewart <kstewart@efficios.com>
Date: Thu, 24 Aug 2023 19:36:58 +0000 (-0400)
Subject: lava/ansible: Switch VM nodes to ci-host-amd64-2d
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=1f28dd0828bd28a42258aad69a6c6cda012b75cb;p=lttng-ci.git

lava/ansible: Switch VM nodes to ci-host-amd64-2d

Change-Id: Ia5b72defd7ac5963a6731714f16d3412140a3041
---

diff --git a/automation/ansible/host_vars/ci-host-amd64-2d.internal.efficios.com.yml b/automation/ansible/host_vars/ci-host-amd64-2d.internal.efficios.com.yml
index 585590a..542ac22 100644
--- a/automation/ansible/host_vars/ci-host-amd64-2d.internal.efficios.com.yml
+++ b/automation/ansible/host_vars/ci-host-amd64-2d.internal.efficios.com.yml
@@ -1,4 +1,7 @@
 ---
+extra_root_ssh_authorized_keys:
+  # yamllint disable-line rule:line-length
+  - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILmmI2pn+ncFKm/fOS5+RskBGnhbMd0p399ZWEKLUQ+Q lava-master-03'
 lxd_cluster_ip: 172.18.0.197
 lxd_cluster:
   enabled: true
diff --git a/automation/ansible/vars/ci-instances.yml b/automation/ansible/vars/ci-instances.yml
index 7ee7f48..9db508b 100644
--- a/automation/ansible/vars/ci-instances.yml
+++ b/automation/ansible/vars/ci-instances.yml
@@ -1040,3 +1040,39 @@ containers:
       host: 'ci-host-amd64-1c.internal.efficios.com'
     meta:
       address: 172.18.17.10
+  # VMs for running tests using lava
+  - jenkins: {}
+    meta: {}
+    vm:
+      name: 'lava-node-amd64-01'
+      disk: '/var/lib/libvirt/images/lava-node-amd64-01.qcow'
+      disk_capacity: '10G'
+      host: 'ci-host-amd64-2d.internal.efficios.com'
+  - jenkins: {}
+    meta: {}
+    vm:
+      name: 'lava-node-amd64-02'
+      disk: '/var/lib/libvirt/images/lava-node-amd64-02.qcow'
+      disk_capacity: '10G'
+      host: 'ci-host-amd64-2d.internal.efficios.com'
+  - jenkins: {}
+    meta: {}
+    vm:
+      name: 'lava-node-amd64-03'
+      disk: '/var/lib/libvirt/images/lava-node-amd64-03.qcow'
+      disk_capacity: '10G'
+      host: 'ci-host-amd64-2d.internal.efficios.com'
+  - jenkins: {}
+    meta: {}
+    vm:
+      name: 'lava-node-amd64-04'
+      disk: '/var/lib/libvirt/images/lava-node-amd64-04.qcow'
+      disk_capacity: '10G'
+      host: 'ci-host-amd64-2d.internal.efficios.com'
+  - jenkins: {}
+    meta: {}
+    vm:
+      name: 'lava-node-amd64-05'
+      disk: '/var/lib/libvirt/images/lava-node-amd64-05.qcow'
+      disk_capacity: '10G'
+      host: 'ci-host-amd64-2d.internal.efficios.com'
diff --git a/lava/devices/lava-node-amd64-01.jinja2 b/lava/devices/lava-node-amd64-01.jinja2
index a89c498..8fe0206 100644
--- a/lava/devices/lava-node-amd64-01.jinja2
+++ b/lava/devices/lava-node-amd64-01.jinja2
@@ -1,8 +1,8 @@
 {% extends 'x86.jinja2' %}
-{% set connection_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system console --force lava-node-amd64-01' %}
-{% set hard_reset_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-01' %}
-{% set power_off_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-01' %}
-{% set power_on_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-01' %}
+{% set connection_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system console --force lava-node-amd64-01' %}
+{% set hard_reset_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-01' %}
+{% set power_off_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-01' %}
+{% set power_on_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-01' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
 {% set boot_character_delay = '100' %}
diff --git a/lava/devices/lava-node-amd64-02.jinja2 b/lava/devices/lava-node-amd64-02.jinja2
index 8c1f78a..50604b3 100644
--- a/lava/devices/lava-node-amd64-02.jinja2
+++ b/lava/devices/lava-node-amd64-02.jinja2
@@ -1,8 +1,8 @@
 {% extends 'x86.jinja2' %}
-{% set connection_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system console --force lava-node-amd64-02' %}
-{% set hard_reset_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-02' %}
-{% set power_off_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-02' %}
-{% set power_on_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-02' %}
+{% set connection_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system console --force lava-node-amd64-02' %}
+{% set hard_reset_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-02' %}
+{% set power_off_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-02' %}
+{% set power_on_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-02' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
 {% set boot_character_delay = '100' %}
diff --git a/lava/devices/lava-node-amd64-03.jinja2 b/lava/devices/lava-node-amd64-03.jinja2
index e24d39c..9be0b07 100644
--- a/lava/devices/lava-node-amd64-03.jinja2
+++ b/lava/devices/lava-node-amd64-03.jinja2
@@ -1,8 +1,8 @@
 {% extends 'x86.jinja2' %}
-{% set connection_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system console --force lava-node-amd64-03' %}
-{% set hard_reset_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-03' %}
-{% set power_off_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-03' %}
-{% set power_on_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-03' %}
+{% set connection_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system console --force lava-node-amd64-03' %}
+{% set hard_reset_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-03' %}
+{% set power_off_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-03' %}
+{% set power_on_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-03' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
 {% set boot_character_delay = '100' %}
diff --git a/lava/devices/lava-node-amd64-04.jinja2 b/lava/devices/lava-node-amd64-04.jinja2
index 1de006e..cf0bc46 100644
--- a/lava/devices/lava-node-amd64-04.jinja2
+++ b/lava/devices/lava-node-amd64-04.jinja2
@@ -1,8 +1,8 @@
 {% extends 'x86.jinja2' %}
-{% set connection_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system console --force lava-node-amd64-04' %}
-{% set hard_reset_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-04' %}
-{% set power_off_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-04' %}
-{% set power_on_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-04' %}
+{% set connection_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system console --force lava-node-amd64-04' %}
+{% set hard_reset_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-04' %}
+{% set power_off_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-04' %}
+{% set power_on_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-04' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
 {% set boot_character_delay = '100' %}
diff --git a/lava/devices/lava-node-amd64-05.jinja2 b/lava/devices/lava-node-amd64-05.jinja2
index f056d80..0a305b9 100644
--- a/lava/devices/lava-node-amd64-05.jinja2
+++ b/lava/devices/lava-node-amd64-05.jinja2
@@ -1,8 +1,8 @@
 {% extends 'x86.jinja2' %}
-{% set connection_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system console --force lava-node-amd64-05' %}
-{% set hard_reset_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-05' %}
-{% set power_off_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-05' %}
-{% set power_on_command = 'virsh --connect qemu+ssh://cloud06.internal.efficios.com/system reset lava-node-amd64-05' %}
+{% set connection_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system console --force lava-node-amd64-05' %}
+{% set hard_reset_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-05' %}
+{% set power_off_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-05' %}
+{% set power_on_command = 'virsh --connect qemu+ssh://ci-host-amd64-2d.internal.efficios.com/system reset lava-node-amd64-05' %}
 {% set soft_reset_command = 'reboot' %}
 {% set boot_interface = 'net0' %}
 {% set boot_character_delay = '100' %}