From 33acfed1c0d0cba9bb834c9c367ec8eb9aa25a16 Mon Sep 17 00:00:00 2001 From: Leandro Poroli Date: Thu, 12 Sep 2024 11:10:13 -0300 Subject: [PATCH] edited the expected deployments name in the test --- .github/workflows/ci-e2e-tests.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-e2e-tests.yml b/.github/workflows/ci-e2e-tests.yml index b5616a9..2389d0a 100644 --- a/.github/workflows/ci-e2e-tests.yml +++ b/.github/workflows/ci-e2e-tests.yml @@ -71,7 +71,7 @@ jobs: if [ "${services}" != "cartservice frontend postgres productcatalogservice" ]; then exit 1; fi deployments=$(curl http://localhost:8080/tenant/${tenant_id}/cluster-resources | jq -r '.deployments[].metadata.name' | tr " " "\n" | sort -g | tr "\n" " " | xargs) echo "Deployments: $deployments" - if [ "${deployments}" != "cartservice-prod frontend-prod postgres-prod productcatalogservice-prod" ]; then exit 1; fi + if [ "${deployments}" != "cartservice-baseline frontend-baseline postgres-baseline productcatalogservice-baseline" ]; then exit 1; fi - name: Validate topology endpoint run: | @@ -83,9 +83,11 @@ jobs: run: | KARDINAL_CLI_DEV_MODE=TRUE kardinal flow create frontend kurtosistech/frontend:demo-frontend > kardinal.out flow_id=$(grep "Flow.*created" kardinal.out | cut -d ' ' -f2 | tr -d "\"") + echo "FlowID: $flow_id" tenant_id=${{ steps.tenant.outputs.id }} deployments=$(curl http://localhost:8080/tenant/${tenant_id}/cluster-resources | jq -r '.deployments[].metadata.name' | tr " " "\n" | sort -g | tr "\n" " " | xargs) - if [ "${deployments}" != "cartservice-prod frontend-${flow_id} frontend-prod postgres-prod productcatalogservice-prod" ]; then exit 1; fi + echo "Deployments: $deployments" + if [ "${deployments}" != "cartservice-baseline frontend-baseline frontend-${flow_id} postgres-baseline productcatalogservice-baseline" ]; then exit 1; fi KARDINAL_CLI_DEV_MODE=TRUE kardinal flow ls | grep ${flow_id} KARDINAL_CLI_DEV_MODE=TRUE kardinal flow delete ${flow_id} @@ -93,9 +95,11 @@ jobs: run: | KARDINAL_CLI_DEV_MODE=TRUE kardinal flow create frontend kurtosistech/frontend:demo-on-sale -s productcatalogservice=kurtosistech/productcatalogservice:demo-on-sale > kardinal.out flow_id=$(grep "Flow.*created" kardinal.out | cut -d ' ' -f2 | tr -d "\"") + echo "FlowID: $flow_id" tenant_id=${{ steps.tenant.outputs.id }} deployments=$(curl http://localhost:8080/tenant/${tenant_id}/cluster-resources | jq -r '.deployments[].metadata.name' | tr " " "\n" | sort -g | tr "\n" " " | xargs) - if [ "${deployments}" != "cartservice-prod frontend-${flow_id} frontend-prod postgres-prod productcatalogservice-${flow_id} productcatalogservice-prod" ]; then exit 1; fi + echo "Deployments: $deployments" + if [ "${deployments}" != "cartservice-baseline frontend-baseline frontend-${flow_id} postgres-baseline productcatalogservice-baseline productcatalogservice-${flow_id}" ]; then exit 1; fi KARDINAL_CLI_DEV_MODE=TRUE kardinal flow ls | grep ${flow_id} KARDINAL_CLI_DEV_MODE=TRUE kardinal flow delete ${flow_id} @@ -117,8 +121,8 @@ jobs: - name: Delete base topology and dev flows run: | - KARDINAL_CLI_DEV_MODE=TRUE kardinal flow delete prod - if KARDINAL_CLI_DEV_MODE=TRUE kardinal flow ls | grep prod; then echo "Topologies not deleted"; exit 1; fi + KARDINAL_CLI_DEV_MODE=TRUE kardinal flow delete baseline + if KARDINAL_CLI_DEV_MODE=TRUE kardinal flow ls | grep baseline; then echo "Topologies not deleted"; exit 1; fi tenant_id=${{ steps.tenant.outputs.id }} deployments=$(curl http://localhost:8080/tenant/${tenant_id}/cluster-resources | jq -r '.deployments[].metadata.name' | tr " " "\n" | sort -g | tr "\n" " " | xargs) if [ "${deployments}" != "" ]; then echo "Deployments list not empty"; exit 1; fi