Skip to content

Commit 4c5467f

Browse files
Remove references to deleted compute images in multiple tests (#12062) (#832)
[upstream:cdd858547166aefcd00e45d209f6b31d63d569dc] Signed-off-by: Modular Magician <[email protected]>
1 parent 9159d45 commit 4c5467f

File tree

3 files changed

+55
-10
lines changed

3 files changed

+55
-10
lines changed

image_basic/main.tf

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1+
data "google_compute_image" "debian" {
2+
family = "debian-12"
3+
project = "debian-cloud"
4+
}
5+
6+
resource "google_compute_disk" "persistent" {
7+
name = "example-disk-${local.name_suffix}"
8+
image = data.google_compute_image.debian.self_link
9+
size = 10
10+
type = "pd-ssd"
11+
zone = "us-central1-a"
12+
}
13+
114
resource "google_compute_image" "example" {
215
name = "example-image-${local.name_suffix}"
316

4-
raw_disk {
5-
source = "https://storage.googleapis.com/bosh-gce-raw-stemcells/bosh-stemcell-97.98-google-kvm-ubuntu-xenial-go_agent-raw-1557960142.tar.gz"
6-
}
17+
source_disk = google_compute_disk.persistent.id
718
}
Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
1+
data "google_compute_image" "debian" {
2+
family = "debian-12"
3+
project = "debian-cloud"
4+
}
5+
6+
resource "google_compute_disk" "persistent" {
7+
name = "example-disk-${local.name_suffix}"
8+
image = data.google_compute_image.debian.self_link
9+
size = 10
10+
type = "pd-ssd"
11+
zone = "us-central1-a"
12+
}
13+
114
resource "google_compute_image" "example" {
215
name = "example-sl-image-${local.name_suffix}"
316

4-
raw_disk {
5-
source = "https://storage.googleapis.com/bosh-gce-raw-stemcells/bosh-stemcell-97.98-google-kvm-ubuntu-xenial-go_agent-raw-1557960142.tar.gz"
6-
}
17+
source_disk = google_compute_disk.persistent.id
718
storage_locations = ["us-central1"]
819
}

image_guest_os/main.tf

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,38 @@
1+
data "google_compute_image" "debian" {
2+
family = "debian-12"
3+
project = "debian-cloud"
4+
}
5+
6+
resource "google_compute_disk" "persistent" {
7+
name = "example-disk-${local.name_suffix}"
8+
image = data.google_compute_image.debian.self_link
9+
size = 10
10+
type = "pd-ssd"
11+
zone = "us-central1-a"
12+
}
13+
114
resource "google_compute_image" "example" {
215
name = "example-image-${local.name_suffix}"
316

4-
raw_disk {
5-
source = "https://storage.googleapis.com/bosh-gce-raw-stemcells/bosh-stemcell-97.98-google-kvm-ubuntu-xenial-go_agent-raw-1557960142.tar.gz"
17+
source_disk = google_compute_disk.persistent.id
18+
19+
guest_os_features {
20+
type = "UEFI_COMPATIBLE"
21+
}
22+
23+
guest_os_features {
24+
type = "VIRTIO_SCSI_MULTIQUEUE"
25+
}
26+
27+
guest_os_features {
28+
type = "GVNIC"
629
}
730

831
guest_os_features {
9-
type = "SECURE_BOOT"
32+
type = "SEV_CAPABLE"
1033
}
1134

1235
guest_os_features {
13-
type = "MULTI_IP_SUBNET"
36+
type = "SEV_LIVE_MIGRATABLE_V2"
1437
}
1538
}

0 commit comments

Comments
 (0)