From 0f64cdd20658bd7ff669d60ddc96532e8a3f980d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Peliz=C3=A4us?= Date: Mon, 29 Jun 2026 16:04:17 +0200 Subject: [PATCH 1/3] test/e2e: Accommodate latest LXD provider MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julian Pelizäus --- test/e2e/main.tf | 79 ++++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 33 deletions(-) diff --git a/test/e2e/main.tf b/test/e2e/main.tf index 61592c408..209b1a832 100644 --- a/test/e2e/main.tf +++ b/test/e2e/main.tf @@ -42,59 +42,70 @@ resource "lxd_profile" "e2e" { } # Images -resource "lxd_cached_image" "ctn" { - count = var.containers_per_host > 0 ? 1 : 0 - project = lxd_project.e2e.name - remote = lxd_project.e2e.remote - source_remote = "ubuntu-minimal-daily" - source_image = "24.04" - type = "container" +resource "lxd_image" "ctn" { + count = var.containers_per_host > 0 ? 1 : 0 + project = lxd_project.e2e.name + remote = lxd_project.e2e.remote + source_image = { + image = "ubuntu-minimal-daily:24.04" + type = "container" + } } -resource "lxd_cached_image" "vm" { - count = var.vms_per_host > 0 ? 1 : 0 - project = lxd_project.e2e.name - remote = lxd_project.e2e.remote - source_remote = "ubuntu-minimal-daily" - source_image = "24.04" - type = "virtual-machine" +resource "lxd_image" "vm" { + count = var.vms_per_host > 0 ? 1 : 0 + project = lxd_project.e2e.name + remote = lxd_project.e2e.remote + source_image = { + image = "ubuntu-minimal-daily:24.04" + type = "virtual-machine" + } } # Containers resource "lxd_instance" "e2e-ctn" { for_each = { - for _, v in local.containers : v.instance => v.target + for _, v in local.containers : v.instance => v } - name = each.key - target = each.value - type = "container" - remote = lxd_project.e2e.remote - project = lxd_project.e2e.name - profiles = [lxd_profile.e2e.name] - image = lxd_cached_image.ctn[0].fingerprint - wait_for_network = true + name = each.key + target = each.value.target + type = "container" + remote = lxd_project.e2e.remote + project = lxd_project.e2e.name + profiles = [lxd_profile.e2e.name] + image = each.value.image + + wait_for { + type = "ipv4" + } } # VMs resource "lxd_instance" "e2e-vm" { for_each = { - for _, v in local.vms : v.instance => v.target + for _, v in local.vms : v.instance => v } - name = each.key - target = each.value - type = "virtual-machine" - remote = lxd_project.e2e.remote - project = lxd_project.e2e.name - profiles = [lxd_profile.e2e.name] - image = lxd_cached_image.vm[0].fingerprint - wait_for_network = true - allow_restart = true + name = each.key + target = each.value.target + type = "virtual-machine" + remote = lxd_project.e2e.remote + project = lxd_project.e2e.name + profiles = [lxd_profile.e2e.name] + image = each.value.image + allow_restart = true config = { "migration.stateful" = "true" } + + wait_for { + type = "ipv4" + } + wait_for { + type = "agent" + } } # Locals @@ -106,6 +117,7 @@ locals { for i in range(var.containers_per_host) : { instance = "c${format("%02d", var.containers_per_host * index + i + 1)}" target = cluster_member_name + image = lxd_image.ctn[0].fingerprint } ] ]) @@ -114,6 +126,7 @@ locals { for i in range(var.vms_per_host) : { instance = "v${format("%02d", var.vms_per_host * index + i + 1)}" target = cluster_member_name + image = lxd_image.vm[0].fingerprint } ] ]) From 3ee34c41f48f53cf28ece8a3f72cfa79ef829dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Peliz=C3=A4us?= Date: Tue, 30 Jun 2026 09:52:30 +0200 Subject: [PATCH 2/3] test/e2e: Add provider remote MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julian Pelizäus --- test/e2e/versions.tf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/test/e2e/versions.tf b/test/e2e/versions.tf index ddcbeb012..abe5a2da9 100644 --- a/test/e2e/versions.tf +++ b/test/e2e/versions.tf @@ -7,3 +7,10 @@ terraform { } } } + +provider "lxd" { + remote { + name = "local" + address = "unix://" + } +} From cf2bb241a072d68a7cf9f980cec3760da63aae33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20Peliz=C3=A4us?= Date: Mon, 29 Jun 2026 17:32:19 +0200 Subject: [PATCH 3/3] test/e2e: Require version 3.0.2 of the LXD provider MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julian Pelizäus --- test/e2e/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/versions.tf b/test/e2e/versions.tf index abe5a2da9..fb0d1d619 100644 --- a/test/e2e/versions.tf +++ b/test/e2e/versions.tf @@ -3,7 +3,7 @@ terraform { required_providers { lxd = { source = "terraform-lxd/lxd" - version = ">= 2.5.0" + version = ">= 3.0.2" } } }