Fix e2e_tests (#308)

Author: adjackura

e2e_tests/test_suites/inventory/inventory.go

@@ -91,7 +91,7 @@ func runGatherInventoryTest(ctx context.Context, testSetup *inventoryTestSetup,
 	metadataItems = append(metadataItems, testSetup.startup)
 	metadataItems = append(metadataItems, compute.BuildInstanceMetadataItem("enable-osconfig", "true"))
 	metadataItems = append(metadataItems, compute.BuildInstanceMetadataItem("osconfig-disabled-features", "tasks,guestpolicies"))
-	metadataItems = append(metadataItems, compute.BuildInstanceMetadataItem("osconfig-poll-interval", "30s"))
+	metadataItems = append(metadataItems, compute.BuildInstanceMetadataItem("osconfig-poll-interval", "1"))
 
 	testProjectConfig := testconfig.GetProject()
 	zone := testProjectConfig.AcquireZone()

e2e_tests/test_suites/inventoryreporting/inventory_reporting.go

@@ -84,7 +84,7 @@ func runInventoryReportingTest(ctx context.Context, testSetup *inventoryTestSetu
 	metadataItems = append(metadataItems, testSetup.startup)
 	metadataItems = append(metadataItems, compute.BuildInstanceMetadataItem("enable-osconfig", "true"))
 	metadataItems = append(metadataItems, compute.BuildInstanceMetadataItem("osconfig-disabled-features", "tasks,guestpolicies"))
-	metadataItems = append(metadataItems, compute.BuildInstanceMetadataItem("osconfig-poll-interval", "30s"))
+	metadataItems = append(metadataItems, compute.BuildInstanceMetadataItem("osconfig-poll-interval", "1"))
 
 	testProjectConfig := testconfig.GetProject()
 	zone := testProjectConfig.AcquireZone()

e2e_tests/test_suites/ospolicies/ospolicies.go

@@ -121,18 +121,26 @@ func createOSPolicyAssignment(ctx context.Context, client *osconfigZonalV1alpha.
 	defer gpMx.Unlock()
 	op, err := client.CreateOSPolicyAssignment(ctx, req)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error running CreateOSPolicyAssignment: %s", utils.GetStatusFromError(err))
 	}
 	//return op.Wait(ctx)
 	_ = op
 
+	time.Sleep(30 * time.Second)
 	getReq := &osconfigpb.GetOSPolicyAssignmentRequest{Name: fmt.Sprintf("%s/osPolicyAssignments/%s", req.GetParent(), req.GetOsPolicyAssignmentId())}
-	ospa, err := client.GetOSPolicyAssignment(ctx, getReq)
-	if err != nil {
-		return nil, err
-	}
-
-	return ospa, nil
+	for i := 0; i < 20; i++ {
+		ospa, err := client.GetOSPolicyAssignment(ctx, getReq)
+		if err != nil {
+			return nil, fmt.Errorf("error running GetOSPolicyAssignment: %s", utils.GetStatusFromError(err))
+		}
+		switch ospa.GetRolloutState() {
+		case osconfigpb.OSPolicyAssignment_IN_PROGRESS, osconfigpb.OSPolicyAssignment_CANCELLED:
+			return ospa, nil
+		}
+		time.Sleep(10 * time.Second)
+	}
+
+	return nil, fmt.Errorf("timed out waiting for rollout to finish")
 }
 
 func runTest(ctx context.Context, testCase *junitxml.TestCase, testSetup *osPolicyTestSetup, logger *log.Logger) {
@@ -180,7 +188,7 @@ func runTest(ctx context.Context, testCase *junitxml.TestCase, testSetup *osPoli
 	testCase.Logf("Creating OSPolicyAssignment")
 	ospa, err := createOSPolicyAssignment(ctx, client, req)
 	if err != nil {
-		testCase.WriteFailure("Error running CreateOSPolicyAssignment: %s", utils.GetStatusFromError(err))
+		testCase.WriteFailure("Error running createOSPolicyAssignment: %s", err)
 		return
 	}
 	defer cleanupOSPolicyAssignment(ctx, testCase, ospa.GetName())

e2e_tests/utils/utils.go

@@ -69,11 +69,16 @@ systemctl restart google-osconfig-agent` + CurlPost
 
 	// CurlPost indicates agent is installed.
 	CurlPost = `
+uri=http://metadata.google.internal/computeMetadata/v1/instance/guest-attributes/guestInventory/LastUpdated
+curl -X DELETE $uri -H "Metadata-Flavor: Google"
+
 uri=http://metadata.google.internal/computeMetadata/v1/instance/guest-attributes/osconfig_tests/install_done
 curl -X PUT --data "1" $uri -H "Metadata-Flavor: Google"
 `
 
 	windowsPost = `
+$uri = 'http://metadata.google.internal/computeMetadata/v1/instance/guest-attributes/guestInventory/LastUpdated'
+Invoke-RestMethod -Method DELETE -Uri $uri -Headers @{"Metadata-Flavor" = "Google"}
 Start-Sleep 10
 $uri = 'http://metadata.google.internal/computeMetadata/v1/instance/guest-attributes/osconfig_tests/install_done'
 Invoke-RestMethod -Method PUT -Uri $uri -Headers @{"Metadata-Flavor" = "Google"} -Body 1