Skip to content

Commit

Permalink
[Backport 2.x] Make ITs more robust with longer timeouts (#307)
Browse files Browse the repository at this point in the history
Make ITs more robust with longer timeouts (#306)

Comment-out incompleted implementation and extend timeouts


(cherry picked from commit 2b10621)

Signed-off-by: Daniel Widdis <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
1 parent 4953d82 commit f98be8f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,7 @@ public void setUpSettings() throws Exception {
// TODO: figure out know why we need this and we should pursue a better option that doesn't require HTTP5
Thread.sleep(10000);
// Ensure .plugins-ml-config is created before proceeding with integration tests
assertBusy(() -> { assertTrue(indexExistsWithAdminClient(".plugins-ml-config")); });

assertBusy(() -> { assertTrue(indexExistsWithAdminClient(".plugins-ml-config")); }, 30, TimeUnit.SECONDS);
}

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,9 @@
import org.opensearch.flowframework.model.WorkflowEdge;
import org.opensearch.flowframework.model.WorkflowNode;

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static org.opensearch.flowframework.common.CommonValue.CREDENTIAL_FIELD;
import static org.opensearch.flowframework.common.CommonValue.PROVISION_WORKFLOW;
Expand Down Expand Up @@ -65,6 +63,8 @@ public void testSearchWorkflows() throws Exception {
}

public void testCreateAndProvisionLocalModelWorkflow() throws Exception {
/*- Local model registration is not yet fully complete. Commenting this test out until it is.
* https://github.com/opensearch-project/flow-framework/issues/305
// Using a 3 step template to create a model group, register a remote model and deploy model
Template template = TestHelpers.createTemplateFromFile("registerlocalmodel-deploymodel.json");
Expand Down Expand Up @@ -117,14 +117,12 @@ public void testCreateAndProvisionLocalModelWorkflow() throws Exception {
assertEquals(RestStatus.OK, TestHelpers.restStatus(response));
getAndAssertWorkflowStatus(workflowId, State.PROVISIONING, ProvisioningProgress.IN_PROGRESS);
// TODO: This provisioning isn't completing, probably due to incorrect task vs. model ID in RetryableWorkflowStep
// May be fixed by https://github.com/opensearch-project/flow-framework/pull/298
// Wait until provisioning has completed successfully before attempting to retrieve created resources
// List<ResourceCreated> resourcesCreated = getResourcesCreated(workflowId, 100);
List<ResourceCreated> resourcesCreated = getResourcesCreated(workflowId, 100);
// TODO: This template should create 2 resources, registered_model_id and deployed model_id
// But RegisterLocalModelStep does not yet update state index so might be 1
// assertEquals(0, resourcesCreated.size());
assertEquals(0, resourcesCreated.size());
*/
}

public void testCreateAndProvisionRemoteModelWorkflow() throws Exception {
Expand Down Expand Up @@ -168,7 +166,7 @@ public void testCreateAndProvisionRemoteModelWorkflow() throws Exception {
getAndAssertWorkflowStatus(workflowId, State.PROVISIONING, ProvisioningProgress.IN_PROGRESS);

// Wait until provisioning has completed successfully before attempting to retrieve created resources
List<ResourceCreated> resourcesCreated = getResourcesCreated(workflowId, 10);
List<ResourceCreated> resourcesCreated = getResourcesCreated(workflowId, 30);

// This template should create 3 resources, connector_id, regestered model_id and deployed model_id
assertEquals(3, resourcesCreated.size());
Expand Down

0 comments on commit f98be8f

Please sign in to comment.