bug/9962-rachael-detox-iOS-android-send-to-testRail-broken (#10022)

department-of-veterans-affairs · Oct 29, 2024 · 900f170 · 900f170
1 parent c5df00e
commit 900f170
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 20 deletions.
diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml
@@ -30,10 +30,6 @@ on:
         description: 'Add results to testRail?'
         type: boolean
         required: false
-      device_specific:
-        description: 'Is your testRail run Android only? (only check if adding results to testRail)'
-        type: boolean
-        required: false
   schedule:
     - cron: '0 4 * * 1,2,3,4,5'
   workflow_run:
@@ -364,7 +360,6 @@ jobs:
     with: 
       test_names: "${{matrix.testsuite}}"
       testRail_name: ${{ inputs.testRail_name }}
-      test_specific_OS_needed: ${{ inputs.device_specific}}
       test_OS_name: "Android"
     secrets: inherit
 

diff --git a/.github/workflows/e2e_ios.yml b/.github/workflows/e2e_ios.yml
@@ -30,10 +30,6 @@ on:
         description: 'Add results to testRail?'
         type: boolean
         required: false
-      device_specific:
-        description: 'Is your testRail run iOS only? (only check if adding results to testRail)'
-        type: boolean
-        required: false
   schedule:
     - cron: '0 4 * * 1,2,3,4,5'
   workflow_run:
@@ -343,7 +339,6 @@ jobs:
     with: 
       test_names: "${{matrix.testsuite}}"
       testRail_name: ${{ inputs.testRail_name }}
-      test_specific_OS_needed: ${{ inputs.device_specific}}
       test_OS_name: "iOS"
     secrets: inherit
 

diff --git a/.github/workflows/update_testrail_results.yml b/.github/workflows/update_testrail_results.yml
@@ -16,9 +16,6 @@ on:
       testRail_name:
         type: string
         default: ''
-      test_specific_OS_needed:
-        type: boolean
-        default: false
       test_OS_name:
         type: string
         default: ''
@@ -53,18 +50,13 @@ jobs:
           echo "TEST_RUN_ID=$resp" >> "$GITHUB_OUTPUT"
           if [ "$resp" == '' ]; then
             if [[ "${{ inputs.testRail_name }}" == "" ]]; then
-              if [[ ${{ inputs.test_specific_OS_needed}} == true ]]; then
-                OS_name="${{inputs.test_OS_name}}: "
-              else
-                OS_name=''
-              fi
               resp=$(curl -X POST -H 'Content-Type: application/json' \
                   -u "${{secrets.TEST_RAIL_USER}}:${{secrets.TEST_RAIL_KEY}}" \
-                  -d '{"suite_id": 92, "include_all": false, "name": "'"${OS_name}$(date +'%Y-%m-%d')"'"}' \
+                  -d '{"suite_id": 92, "include_all": false, "name": "'"$(date +'%Y-%m-%d')"'"}' \
                   "https://dsvavsp.testrail.io//index.php?/api/v2/add_run/29" )
               resp=$(curl -X GET -H 'Content-Type: application/json' \
                   -u "${{secrets.TEST_RAIL_USER}}:${{secrets.TEST_RAIL_KEY}}" \
-                  "https://dsvavsp.testrail.io//index.php?/api/v2/get_runs/29&is_completed=0" | jq '.runs[] | select(.name =="'"${OS_name}$(date +'%Y-%m-%d')"'") | .id')
+                  "https://dsvavsp.testrail.io//index.php?/api/v2/get_runs/29&is_completed=0" | jq '.runs[] | select(.name =="'"$(date +'%Y-%m-%d')"'") | .id')
               echo "$resp"
               echo "TEST_RUN_ID=$resp" >> "$GITHUB_OUTPUT"
             else