From 144e980547fbd10f6ad6bca28e1cd24677003391 Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Thu, 15 Aug 2024 11:04:57 -0400 Subject: [PATCH] Run CI on all changed modules, not just the first one. (#223) * Find all changed modules, not just the first one. * Ensure all tests pass still. * Fix-up broken tests. * Revert "Ensure all tests pass still." This reverts commit f69221cc66e8bd3c77e238ba9e4cc769d76d9802. --------- Co-authored-by: Patrick Cloke --- .github/workflows/module-checks.yml | 2 +- modules/eks/ray-operator/tests/test_app.py | 1 + modules/eks/ray-operator/tests/test_stack.py | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/module-checks.yml b/.github/workflows/module-checks.yml index 04b079c9..9d736ea5 100644 --- a/.github/workflows/module-checks.yml +++ b/.github/workflows/module-checks.yml @@ -47,7 +47,7 @@ jobs: run: | set -x # Get all the modules that have the file "deployspec.yaml" - MODULES=$(echo $ALL_CHANGED_FILES | cut -d/ -f 2-3 | uniq) + MODULES=$(echo $ALL_CHANGED_FILES | tr ' ' '\n' | cut -d/ -f 2-3 | uniq) # Create our json structure [{"module_name": "..."}] MODULES_JSON=$(echo "$MODULES" | jq -R -s 'split("\n")' | jq '[ .[] | select(length > 0) ]' | jq 'map({"module_name": .})') # Export the modules as json to the outputs diff --git a/modules/eks/ray-operator/tests/test_app.py b/modules/eks/ray-operator/tests/test_app.py index f9fe7c86..5618fdb5 100644 --- a/modules/eks/ray-operator/tests/test_app.py +++ b/modules/eks/ray-operator/tests/test_app.py @@ -25,6 +25,7 @@ def stack_defaults(): os.environ["SEEDFARMER_PARAMETER_EKS_OPENID_ISSUER"] = "sts.amazon.com" os.environ["SEEDFARMER_PARAMETER_EKS_CLUSTER_ENDPOINT"] = "oidc.eks.us-west-2.amazonaws.com/id/XXXXXXXXXX" os.environ["SEEDFARMER_PARAMETER_EKS_CERT_AUTH_DATA"] = "cert" + os.environ["SEEDFARMER_PARAMETER_EKS_HANDLER_ROLE_ARN"] = "arn:aws:iam::123456789012:role/eks-test-YYYYYY" os.environ["SEEDFARMER_PARAMETER_NAMESPACE"] = "namespace" # Unload the app import so that subsequent tests don't reuse diff --git a/modules/eks/ray-operator/tests/test_stack.py b/modules/eks/ray-operator/tests/test_stack.py index f3d70a1a..3922360f 100644 --- a/modules/eks/ray-operator/tests/test_stack.py +++ b/modules/eks/ray-operator/tests/test_stack.py @@ -35,6 +35,7 @@ def rbac_stack(stack_defaults) -> cdk.Stack: eks_cluster_admin_role_arn = "arn:aws:iam::123456789012:role/eks-testing-XXXXXX" eks_oidc_arn = "arn:aws:iam::123456789012:oidc-provider/oidc.eks.us-east-1.amazonaws.com/id/XXXXXXXX" eks_openid_issuer = "sts.amazon.com" + eks_handler_role_arn = "arn:aws:iam::123456789012:oidc-provider/oidc.eks.us-east-1.amazonaws.com/id/YYYYYYYY" namespace = "namespace" data_bucket_name = "bucket" @@ -48,6 +49,7 @@ def rbac_stack(stack_defaults) -> cdk.Stack: eks_admin_role_arn=eks_cluster_admin_role_arn, eks_oidc_arn=eks_oidc_arn, eks_openid_issuer=eks_openid_issuer, + eks_handler_role_arn=eks_handler_role_arn, namespace_name=namespace, data_bucket_name=data_bucket_name, env=cdk.Environment(