From f03d691f8c63629e5a06feca64a1bc7a2296049e Mon Sep 17 00:00:00 2001
From: Wenjin Situ <jsitu@amazon.com>
Date: Thu, 30 Mar 2023 13:17:48 -0700
Subject: [PATCH] Revert "[Cherry Pick] Enable canary report generation (#634)"

This reverts commit 632ec70bbdc75a2d85a7d9ca00278c39b2331824.
---
 tests/canary/canary.buildspec.yaml               | 14 ++++----------
 tests/canary/scripts/push_stats_to_cloudwatch.py |  9 +--------
 tests/canary/scripts/run_test.sh                 | 10 +++++-----
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/tests/canary/canary.buildspec.yaml b/tests/canary/canary.buildspec.yaml
index ebbb1a0473..fd119f8fc8 100644
--- a/tests/canary/canary.buildspec.yaml
+++ b/tests/canary/canary.buildspec.yaml
@@ -6,6 +6,7 @@ phases:
       # Get cached test image
       - aws ecr get-login-password --region $CLUSTER_REGION | docker login --username AWS --password-stdin $ECR_CACHE_URI || true
       - docker pull ${ECR_CACHE_URI}:latest --quiet || true
+
       # Build test image
       - >
         docker build -f ./tests/canary/Dockerfile.canary . -t ${ECR_CACHE_URI}:latest --quiet
@@ -14,15 +15,8 @@ phases:
     commands:
       # Run tests
       - docker run --name kf-distro-canary $(env | cut -f1 -d= | sed 's/^/-e /') --mount type=bind,source="$(pwd)/",target="/kubeflow-manifests/" ${ECR_CACHE_URI}:latest
-  post_build:
-    commands:
-      - docker cp kf-distro-canary:/kubeflow-manifests/tests/canary/integration_tests.xml /tmp/results.xml || true
-        # Push test image to cache ECR repo
+      
+      # Push test image to cache ECR repo
       - docker push ${ECR_CACHE_URI}:latest || true
-
-reports:
-  IntegrationTestReport:
-    files:
-      - "results.xml"
-    base-directory: "/tmp"    
+      
       
diff --git a/tests/canary/scripts/push_stats_to_cloudwatch.py b/tests/canary/scripts/push_stats_to_cloudwatch.py
index d74a045e03..7eb333cc11 100644
--- a/tests/canary/scripts/push_stats_to_cloudwatch.py
+++ b/tests/canary/scripts/push_stats_to_cloudwatch.py
@@ -14,19 +14,12 @@ def readXML_and_publish_metrics_to_cw():
         failures = testsuite.attrib["failures"]
         tests = testsuite.attrib["tests"]
         successes = int(tests) - int(failures)
-<<<<<<< HEAD
         success_rate = successes/int(tests)*100
     else:
         failures = 0
         successes = 0
         tests = 0
         success_rate = 0
-=======
-    else:
-        failures = 0
-        successes = 0
-        tests = 1
->>>>>>> 632ec70b ([Cherry Pick] Enable canary report generation (#634))
 
     timestamp = datetime.now().strftime("%Y-%m-%dT%H:%M:%S")
 
@@ -105,4 +98,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()
\ No newline at end of file
diff --git a/tests/canary/scripts/run_test.sh b/tests/canary/scripts/run_test.sh
index b21daa43c5..574d6774ff 100755
--- a/tests/canary/scripts/run_test.sh
+++ b/tests/canary/scripts/run_test.sh
@@ -9,11 +9,10 @@
 # Script configuration
 set -euo pipefail
 
-function push_to_cloudwatch {
-  echo "Pushing Codebuild stats to Cloudwatch."
-  python ../canary/scripts/push_stats_to_cloudwatch.py
+function onError {
+  echo "Run test FAILED. Exiting."
 }
-trap push_to_cloudwatch EXIT
+trap onError ERR
 
 export CANARY_TEST_DIR=${REPO_PATH}/tests/canary
 export E2E_TEST_DIR=${REPO_PATH}/tests/e2e
@@ -32,5 +31,6 @@ mkdir -p $E2E_TEST_DIR/.metadata/
 cp metadata-canary $E2E_TEST_DIR/.metadata/
 
 cd $E2E_TEST_DIR
-pytest tests/test_sanity_portforward.py -s -q --metadata .metadata/metadata-canary --region $CLUSTER_REGION --installation_option $INSTALLATION_OPTION --junitxml ../canary/integration_tests.xml
+pytest tests/test_sanity_portforward.py -s -q --metadata .metadata/metadata-canary --region $CLUSTER_REGION --installation_option $INSTALLATION_OPTION
+