From ba55363c916b8da5ad5fa67ed9b38af3750ec68c Mon Sep 17 00:00:00 2001 From: flyte-bot Date: Tue, 22 Aug 2023 01:35:11 +0000 Subject: [PATCH] Update boilerplate version Signed-off-by: Flyte-Bot --- boilerplate/flyte/end2end/Makefile | 2 ++ boilerplate/flyte/end2end/end2end.sh | 9 ++------- boilerplate/flyte/end2end/functional-test-config.yaml | 2 +- boilerplate/flyte/end2end/run-tests.py | 5 +++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/boilerplate/flyte/end2end/Makefile b/boilerplate/flyte/end2end/Makefile index 61ee99b..98ee63a 100644 --- a/boilerplate/flyte/end2end/Makefile +++ b/boilerplate/flyte/end2end/Makefile @@ -4,6 +4,8 @@ # TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst .PHONY: end2end_execute +end2end_execute: export FLYTESNACKS_PRIORITIES ?= P0 +end2end_execute: export FLYTESNACKS_VERSION ?= $(shell curl --silent "https://api.github.com/repos/flyteorg/flytesnacks/releases/latest" | jq -r .tag_name) end2end_execute: ./boilerplate/flyte/end2end/end2end.sh ./boilerplate/flyte/end2end/functional-test-config.yaml --return_non_zero_on_failure diff --git a/boilerplate/flyte/end2end/end2end.sh b/boilerplate/flyte/end2end/end2end.sh index acc9d01..5dd825c 100755 --- a/boilerplate/flyte/end2end/end2end.sh +++ b/boilerplate/flyte/end2end/end2end.sh @@ -4,14 +4,9 @@ # ONLY EDIT THIS FILE FROM WITHIN THE 'FLYTEORG/BOILERPLATE' REPOSITORY: # # TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst -set -e +set -eu CONFIG_FILE=$1; shift EXTRA_FLAGS=( "$@" ) -# By default only execute `core` tests -PRIORITIES="${PRIORITIES:-P0}" - -LATEST_VERSION=$(curl --silent "https://api.github.com/repos/flyteorg/flytesnacks/releases/latest" | jq -r .tag_name) - -python ./boilerplate/flyte/end2end/run-tests.py $LATEST_VERSION $PRIORITIES $CONFIG_FILE ${EXTRA_FLAGS[@]} +python ./boilerplate/flyte/end2end/run-tests.py $FLYTESNACKS_VERSION $FLYTESNACKS_PRIORITIES $CONFIG_FILE ${EXTRA_FLAGS[@]} diff --git a/boilerplate/flyte/end2end/functional-test-config.yaml b/boilerplate/flyte/end2end/functional-test-config.yaml index 6d06b70..13fc445 100644 --- a/boilerplate/flyte/end2end/functional-test-config.yaml +++ b/boilerplate/flyte/end2end/functional-test-config.yaml @@ -1,5 +1,5 @@ admin: # For GRPC endpoints you might want to use dns:///flyte.myexample.com - endpoint: localhost:30081 + endpoint: dns:///localhost:30080 authType: Pkce insecure: true diff --git a/boilerplate/flyte/end2end/run-tests.py b/boilerplate/flyte/end2end/run-tests.py index 66c678f..6427681 100644 --- a/boilerplate/flyte/end2end/run-tests.py +++ b/boilerplate/flyte/end2end/run-tests.py @@ -28,7 +28,7 @@ "core": [ ("basics.deck.wf", {}), # The chain_workflows example in flytesnacks expects to be running in a sandbox. - # ("control_flow.chain_entities.chain_workflows_wf", {}), + ("control_flow.chain_entities.chain_workflows_wf", {}), ("control_flow.dynamics.wf", {"s1": "Pear", "s2": "Earth"}), ("control_flow.map_task.my_map_workflow", {"a": [1, 2, 3, 4, 5]}), # Workflows that use nested executions cannot be launched via flyteremote. @@ -109,7 +109,8 @@ def sync_executions(remote: FlyteRemote, executions_by_wfgroup: Dict[str, List[F for execution in executions: print(f"About to sync execution_id={execution.id.name}") remote.sync(execution) - except: + except Exception: + print(traceback.format_exc()) print("GOT TO THE EXCEPT") print("COUNT THIS!")