core test changes to fix CI runs

Author: afedorch

oci/core_instance_resource_test.go

@@ -903,6 +903,10 @@ func (s *ResourceCoreInstanceTestSuite) TestAccResourceCoreInstance_preserveBoot
 				},
 			),
 		},
+		// to verify reattaching to the old boot volume resource should be terminated before the waiting for boot volume condition
+		{
+			Config: s.Config,
+		},
 		// ForceNew an instance by changing hostname_label and try reattach to the old boot volume,
 		// We didn't set preserve flag in the previous step, so the boot volume should be deleted and
 		// this should result in an error from service.

oci/core_shape_test.go

@@ -22,7 +22,7 @@ var (
 	shapeResourceRepresentation = map[string]interface{}{
 		"compartment_id": Representation{repType: Required, create: `${var.compartment_id}`},
 		"image_id":       Representation{repType: Required, create: `${oci_core_image.test_image.id}`},
-		"shape_name":     Representation{repType: Required, create: `VM.Standard.B1.1`},
+		"shape_name":     Representation{repType: Required, create: `VM.Standard.E2.1`},
 	}
 
 	ShapeResourceConfig = OciImageIdsVariable +
@@ -61,7 +61,7 @@ func TestCoreShapeResource_basic(t *testing.T) {
 					generateResourceFromRepresentationMap("oci_core_shape_management", "test_shape", Required, Create, shapeResourceRepresentation),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttrSet(resourceName, "image_id"),
-					resource.TestCheckResourceAttr(resourceName, "shape_name", "VM.Standard.B1.1"),
+					resource.TestCheckResourceAttr(resourceName, "shape_name", "VM.Standard.E2.1"),
 				),
 			},
 			// verify Delete Compatible Image Shape

oci/core_volume_attachment_resource_test.go

@@ -47,25 +47,14 @@ func (s *ResourceCoreVolumeAttachmentTestSuite) SetupTest() {
 		security_list_ids = ["${oci_core_virtual_network.t.default_security_list_id}"]
 	}
 
-	variable "InstanceImageOCID" {
-	  type = "map"
-	  default = {
-		// See https://docs.us-phoenix-1.oraclecloud.com/images/
-		// Oracle-provided image "Oracle-Linux-7.5-2018.10.16-0"
-		us-phoenix-1 = "ocid1.image.oc1.phx.aaaaaaaadjnj3da72bztpxinmqpih62c2woscbp6l3wjn36by2cvmdhjub6a"
-		us-ashburn-1 = "ocid1.image.oc1.iad.aaaaaaaawufnve5jxze4xf7orejupw5iq3pms6cuadzjc7klojix6vmk42va"
-		eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaagbrvhganmn7awcr7plaaf5vhabmzhx763z5afiitswjwmzh7upna"
-		uk-london-1 = "ocid1.image.oc1.uk-london-1.aaaaaaaajwtut4l7fo3cvyraate6erdkyf2wdk5vpk6fp6ycng3dv2y3ymvq"
-	  }
-	}
-
 	resource "oci_core_instance" "t" {
 		availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
 		compartment_id = "${var.compartment_id}"
 		display_name = "-tf-instance"
 		image = "${var.InstanceImageOCID[var.region]}"
 		shape = "VM.Standard2.1"
 		subnet_id = "${oci_core_subnet.t.id}"
+		is_pv_encryption_in_transit_enabled = "true"
 		metadata = {
 			ssh_authorized_keys = "${var.ssh_public_key}"
 		}
@@ -81,6 +70,7 @@ func (s *ResourceCoreVolumeAttachmentTestSuite) SetupTest() {
 		image = "${var.InstanceImageOCID[var.region]}"
 		shape = "VM.Standard2.1"
 		subnet_id = "${oci_core_subnet.t.id}"
+		is_pv_encryption_in_transit_enabled = "true"
 		metadata = {
 			ssh_authorized_keys = "${var.ssh_public_key}"
 		}
@@ -94,7 +84,8 @@ func (s *ResourceCoreVolumeAttachmentTestSuite) SetupTest() {
 		compartment_id = "${var.compartment_id}"
 		display_name = "display_name"
 	}
-`
+` + OciImageIdsVariable
+
 	s.ResourceName[0] = "oci_core_volume_attachment.t"
 	s.ResourceName[1] = "oci_core_volume_attachment.t2"
 }