From 61537efd0a4eb5a7c355eefaf5e6a95f94d4be8f Mon Sep 17 00:00:00 2001 From: Eduardo Apolinario Date: Thu, 12 Oct 2023 14:00:50 -0700 Subject: [PATCH] Revert "allow passing cluster pool to run-tests.py (#4210)" This reverts commit db3a7ff0ec6f04ac4cd7f454bfea82ac68574c80. Signed-off-by: Eduardo Apolinario --- boilerplate/flyte/end2end/run-tests.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/boilerplate/flyte/end2end/run-tests.py b/boilerplate/flyte/end2end/run-tests.py index 58b2a5dc74..5365da006e 100644 --- a/boilerplate/flyte/end2end/run-tests.py +++ b/boilerplate/flyte/end2end/run-tests.py @@ -5,7 +5,7 @@ import sys import time import traceback -from typing import Dict, List, Mapping, Tuple, Optional +from typing import Dict, List, Mapping, Tuple import click import requests @@ -89,10 +89,10 @@ } -def execute_workflow(remote: FlyteRemote, version, workflow_name, inputs, cluster_pool_name: Optional[str] = None): +def execute_workflow(remote, version, workflow_name, inputs): print(f"Fetching workflow={workflow_name} and version={version}") wf = remote.fetch_workflow(name=workflow_name, version=version) - return remote.execute(wf, inputs=inputs, wait=False, cluster_pool=cluster_pool_name) + return remote.execute(wf, inputs=inputs, wait=False) def executions_finished(executions_by_wfgroup: Dict[str, List[FlyteWorkflowExecution]]) -> bool: @@ -125,7 +125,6 @@ def schedule_workflow_groups( workflow_groups: List[str], remote: FlyteRemote, terminate_workflow_on_failure: bool, - cluster_pool_name: Optional[str] = None, ) -> Dict[str, bool]: """ Schedule workflows executions for all workflow groups and return True if all executions succeed, otherwise @@ -136,7 +135,7 @@ def schedule_workflow_groups( for wf_group in workflow_groups: workflows = FLYTESNACKS_WORKFLOW_GROUPS.get(wf_group, []) executions_by_wfgroup[wf_group] = [ - execute_workflow(remote, tag, workflow[0], workflow[1], cluster_pool_name) for workflow in workflows + execute_workflow(remote, tag, workflow[0], workflow[1]) for workflow in workflows ] # Wait for all executions to finish @@ -180,7 +179,6 @@ def run( priorities: List[str], config_file_path, terminate_workflow_on_failure: bool, - cluster_pool_name: Optional[str] = None, ) -> List[Dict[str, str]]: remote = FlyteRemote( Config.auto(config_file=config_file_path), @@ -217,7 +215,7 @@ def run( valid_workgroups.append(workflow_group) results_by_wfgroup = schedule_workflow_groups( - flytesnacks_release_tag, valid_workgroups, remote, terminate_workflow_on_failure, cluster_pool_name + flytesnacks_release_tag, valid_workgroups, remote, terminate_workflow_on_failure ) for workflow_group, succeeded in results_by_wfgroup.items(): @@ -263,17 +261,15 @@ def run( @click.argument("flytesnacks_release_tag") @click.argument("priorities") @click.argument("config_file") -@click.argument("cluster_pool_name") def cli( flytesnacks_release_tag, priorities, config_file, return_non_zero_on_failure, terminate_workflow_on_failure, - cluster_pool_name, ): print(f"return_non_zero_on_failure={return_non_zero_on_failure}") - results = run(flytesnacks_release_tag, priorities, config_file, terminate_workflow_on_failure, cluster_pool_name) + results = run(flytesnacks_release_tag, priorities, config_file, terminate_workflow_on_failure) # Write a json object in its own line describing the result of this run to stdout print(f"Result of run:\n{json.dumps(results)}")