From d5fa3936506bdf5ab8e72579d5f16cc0d8edb207 Mon Sep 17 00:00:00 2001
From: Jackie Johnson <107960801+jjSDET@users.noreply.github.com>
Date: Tue, 6 Feb 2024 09:13:11 -0600
Subject: [PATCH] Bug 1873897 - remove testing values

---
 .../ci/release-notify-testrail/kind.yml       | 22 +++++++------------
 taskcluster/scripts/testrail_main.py          |  7 ++----
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/taskcluster/ci/release-notify-testrail/kind.yml b/taskcluster/ci/release-notify-testrail/kind.yml
index 7ce767454530..29f25779d411 100644
--- a/taskcluster/ci/release-notify-testrail/kind.yml
+++ b/taskcluster/ci/release-notify-testrail/kind.yml
@@ -32,14 +32,11 @@ task-defaults:
 
 tasks:
     create-milestone-focus:
-        # disable for testing
-        # dependencies:
-            # ui-test-apk: ui-test-apk-focus-arm-beta
+        dependencies:
+            ui-test-apk: ui-test-apk-focus-arm-beta
         description: Create Testrail Milestone for Focus
-        # run-on-tasks-for: [github-push]
-        # run-on-git-branches: [releases_v]
-        run-on-tasks-for: [github-pull-request] # use this for testing
-        run-on-git-branches: [mte-2053]
+        run-on-tasks-for: [github-push]
+        run-on-git-branches: [releases_v]
         run:
             pre-commands:
                 # get-secrets is called from '..' directory so we need to cd into any directory to make it work
@@ -54,14 +51,11 @@ tasks:
                 TESTRAIL_TEST_SUITE_ID: '49386' # Test Automation Release Milestone - Focus
     
     create-milestone-fenix:
-        # disable for testing
-        # dependencies:
-            # ui-test-apk: ui-test-apk-fenix-arm-beta
+        dependencies:
+            ui-test-apk: ui-test-apk-fenix-arm-beta
         description: Create Testrail Milestone for Fenix
-        # run-on-tasks-for: [github-push]
-        # run-on-git-branches: [releases_v]
-        run-on-tasks-for: [github-pull-request] # use this for testing
-        run-on-git-branches: [mte-2053]
+        run-on-tasks-for: [github-push]
+        run-on-git-branches: [releases_v]
         run:
             pre-commands:
                 # get-secrets is called from '..' directory so we need to cd into any directory to make it work
diff --git a/taskcluster/scripts/testrail_main.py b/taskcluster/scripts/testrail_main.py
index 397b7df98a9a..0feca07f5255 100644
--- a/taskcluster/scripts/testrail_main.py
+++ b/taskcluster/scripts/testrail_main.py
@@ -52,8 +52,7 @@ def main():
         raise ValueError(f"ERROR: Missing Environment Variable: {e}")
 
     # Release information
-    # release_version = get_release_version() # disable for testing
-    release_version = "125.0b6"
+    release_version = get_release_version()
     release_type = get_release_type(release_version)
 
     # Build milestone information
@@ -89,9 +88,7 @@ def main():
             "TESTRAIL_PROJECT_ID": testrail_project_id,
             "TESTRAIL_PRODUCT_TYPE": testrail_product_type,
         }
-        # disable for testing
-        # send_success_notification(success_values, SUCCESS_CHANNEL_ID, options)
-        send_success_notification(success_values, ERROR_CHANNEL_ID, options)
+        send_success_notification(success_values, SUCCESS_CHANNEL_ID, options)
 
     except Exception as error_message:
         send_error_notification(str(error_message), ERROR_CHANNEL_ID, options)