diff --git a/.golangci.yaml b/.golangci.yaml index 212709343..7718ccda2 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -2,4 +2,4 @@ linters-settings: staticcheck: - checks: ["all", "-SA1019", "-SA4009" ] + checks: ["all", "-SA1019" ] diff --git a/tests/packer/builds.pkr.hcl b/tests/packer/builds.pkr.hcl index 976518bf6..a5f538acf 100644 --- a/tests/packer/builds.pkr.hcl +++ b/tests/packer/builds.pkr.hcl @@ -27,17 +27,18 @@ build { provisioner "file" { only = ["qemu.opensuse-*"] destination = "/tmp/src/" - sources = ["${path.cwd}/../apparmor.d-${var.version}*.rpm"] + sources = ["${path.cwd}/../apparmor.d-${var.version}-1.x86_64.rpm"] } provisioner "file" { only = ["qemu.debian-server", "qemu.ubuntu-server", "qemu.ubuntu-desktop"] destination = "/tmp/src/" - sources = ["${path.cwd}/../apparmor.d_${var.version}_all.deb"] + sources = ["${path.cwd}/../apparmor.d_${var.version}_amd64.deb"] } # Wait for cloud-init to finish provisioner "shell" { + except = ["qemu.opensuse-*"] execute_command = "echo '${var.password}' | sudo -S sh -c '{{ .Vars }} {{ .Path }}'" inline = [ "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for Cloud-Init...'; sleep 20; done",