From 020191c70e8bb68fa80fd9ab52d2ca498cb330f0 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 9 Mar 2021 13:51:49 +0200 Subject: [PATCH 1/2] Provide cluster config as positional arg --- test/e2e/e2e/cluster.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/e2e/cluster.py b/test/e2e/e2e/cluster.py index 3eb3660de6..22aeb4b1ff 100644 --- a/test/e2e/e2e/cluster.py +++ b/test/e2e/e2e/cluster.py @@ -38,9 +38,8 @@ def create_cluster(cluster_config: str): "cortex", cluster_cmd, "up", - "-y", - "--config", cluster_config, + "-y", "--configure-env", f"{cluster_name}-{provider}", ], From 504318c487664ca342fd3d63040438be16fdc468 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 9 Mar 2021 14:24:09 +0200 Subject: [PATCH 2/2] Fix .circleci config for AWS/GCP --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ab10e1b5c..93c51130ac 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,7 +63,7 @@ commands: steps: - run: name: Create Cluster - command: cortex cluster up --config << parameters.config >> --configure-env << parameters.provider >> -y + command: cortex cluster up << parameters.config >> --configure-env << parameters.provider >> -y - run: name: Run E2E Tests command: pytest -v test/e2e/tests -k << parameters.provider >> --<< parameters.provider >>-env << parameters.provider >> @@ -77,7 +77,7 @@ commands: steps: - run: name: Create Cluster - command: cortex cluster-gcp up --config << parameters.config >> --configure-env << parameters.provider >> -y + command: cortex cluster-gcp up << parameters.config >> --configure-env << parameters.provider >> -y - run: name: Run E2E Tests command: pytest -v test/e2e/tests -k << parameters.provider >> --<< parameters.provider >>-env << parameters.provider >>