diff --git a/internal/monitor/Makefile b/internal/monitor/Makefile index fb1305d..f0843ed 100644 --- a/internal/monitor/Makefile +++ b/internal/monitor/Makefile @@ -30,11 +30,11 @@ unity-integration-test: go test -timeout 6h -test.v -test.run "^\QTestUnityFirstCheck\E|\QTestUnityIntegration\E" powerscale-integration-test: - RESILIENCY_INT_TEST="true" \ - RESILIENCY_TEST_CLEANUP="true" \ - POLL_K8S="true" \ - SCRIPTS_DIR="../../test/sh" \ - go test -timeout 6h -test.v -test.run "^\QTestPowerScaleFirstCheck\E|\QTestPowerScaleIntegration\E" + RESILIENCY_INT_TEST="true" \ + RESILIENCY_TEST_CLEANUP="true" \ + POLL_K8S="true" \ + SCRIPTS_DIR="../../test/sh" \ + go test -timeout 6h -test.v -test.run "^\QTestPowerScaleFirstCheck\E|\QTestPowerScaleIntegration\E" powerflex-short-integration-test: @@ -52,11 +52,11 @@ unity-short-integration-test: go test -timeout 6h -test.v -test.run "^\QTestUnityShortCheck\E|\QTestUnityShortIntegration\E" powerscale-short-integration-test: - RESILIENCY_SHORT_INT_TEST="true" \ - RESILIENCY_TEST_CLEANUP="true" \ - POLL_K8S="true" \ - SCRIPTS_DIR="../../test/sh" \ - go test -timeout 6h -test.v -test.run "^\QTestPowerScaleShortCheck\E|\QTestPowerScaleShortIntegration\E" + RESILIENCY_SHORT_INT_TEST="true" \ + RESILIENCY_TEST_CLEANUP="true" \ + POLL_K8S="true" \ + SCRIPTS_DIR="../../test/sh" \ + go test -timeout 6h -test.v -test.run "^\QTestPowerScaleShortCheck\E|\QTestPowerScaleShortIntegration\E" powerflex-array-interface-test: RESILIENCY_INT_TEST="true" \ diff --git a/internal/monitor/run.integration b/internal/monitor/run.integration index 59c4a5f..68fc263 100644 --- a/internal/monitor/run.integration +++ b/internal/monitor/run.integration @@ -25,7 +25,7 @@ run_e2e_test() { echo "Clean up any remaining $tester_prefix test pods" sh $RESILIENCY/test/podmontest/uns.sh --prefix "$tester_prefix" --instances 18 sleep "$SLEEP_TIME" - sh $RESILIENCY/tools/mon.sh --once + sh $RESILIENCY/tools/monx.sh --once # Run the e2e echo "****************** Execute the $storage_type E2E test *****************" @@ -34,7 +34,7 @@ run_e2e_test() { echo "E2E test for $storage_type had Return code: " $RC date - sh $RESILIENCY/tools/mon.sh --once + sh $RESILIENCY/tools/monx.sh --once # Collect logs echo "Collecting driver logs from $driver_namespace namespace" @@ -48,10 +48,10 @@ while [ $ITER -le $ITERATIONS ]; do run_e2e_test "powerflex" "vxflexos" "pmtv" run_e2e_test "unity" "unity" "pmtu" - run_e2e_test "isilon" "isilon" "pmti" + run_e2e_test "powerscale" "isilon" "pmti" sleep "$SLEEP_TIME" - sh $RESILIENCY/tools/mon.sh --once + sh $RESILIENCY/tools/monx.sh --once ITER=$((ITER + 1)) if [ -e stop ]; then