Fixing timeouts and inputs

aws-amplify · Nov 1, 2023 · 99d1e82 · 99d1e82
1 parent 6b431ba
commit 99d1e82
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 36 deletions.
diff --git a/.github/workflows/integ_test_api_functional.yml b/.github/workflows/integ_test_api_functional.yml
@@ -42,5 +42,5 @@ jobs:
       project_path: ./AmplifyPlugins/API/Tests/APIHostApp
       xcode_version: '14.3'
       resource_subfolder: api
-      timeout-minutes: 30
+      timeout-minutes: 45
     secrets: inherit
diff --git a/.github/workflows/integ_test_api_graphql_auth_directive.yml b/.github/workflows/integ_test_api_graphql_auth_directive.yml
@@ -36,5 +36,5 @@ jobs:
       project_path: ./AmplifyPlugins/API/Tests/APIHostApp
       xcode_version: '14.3'
       resource_subfolder: api
-      timeout-minutes: 30
+      timeout-minutes: 45
     secrets: inherit
diff --git a/.github/workflows/integ_test_api_graphql_iam.yml b/.github/workflows/integ_test_api_graphql_iam.yml
@@ -36,5 +36,5 @@ jobs:
       project_path: ./AmplifyPlugins/API/Tests/APIHostApp
       xcode_version: '14.3'
       resource_subfolder: api
-      timeout-minutes: 30
+      timeout-minutes: 45
     secrets: inherit
diff --git a/.github/workflows/integ_test_api_graphql_lambda_auth.yml b/.github/workflows/integ_test_api_graphql_lambda_auth.yml
@@ -42,5 +42,5 @@ jobs:
       project_path: ./AmplifyPlugins/API/Tests/APIHostApp
       xcode_version: '14.3'
       resource_subfolder: api
-      timeout-minutes: 30
+      timeout-minutes: 45
     secrets: inherit
diff --git a/.github/workflows/integ_test_api_graphql_lazy_load.yml b/.github/workflows/integ_test_api_graphql_lazy_load.yml
@@ -36,5 +36,5 @@ jobs:
       project_path: ./AmplifyPlugins/API/Tests/APIHostApp
       xcode_version: '14.3'
       resource_subfolder: api
-      timeout-minutes: 30
+      timeout-minutes: 45
     secrets: inherit
diff --git a/.github/workflows/integ_test_api_graphql_user_pool.yml b/.github/workflows/integ_test_api_graphql_user_pool.yml
@@ -36,5 +36,5 @@ jobs:
       project_path: ./AmplifyPlugins/API/Tests/APIHostApp
       xcode_version: '14.3'
       resource_subfolder: api
-      timeout-minutes: 30
+      timeout-minutes: 45
     secrets: inherit
diff --git a/.github/workflows/integ_test_api_rest_iam.yml b/.github/workflows/integ_test_api_rest_iam.yml
@@ -42,5 +42,5 @@ jobs:
       project_path: ./AmplifyPlugins/API/Tests/APIHostApp
       xcode_version: '14.3'
       resource_subfolder: api
-      timeout-minutes: 30
+      timeout-minutes: 45
     secrets: inherit
diff --git a/.github/workflows/integ_test_api_rest_user_pool.yml b/.github/workflows/integ_test_api_rest_user_pool.yml
@@ -36,5 +36,5 @@ jobs:
       project_path: ./AmplifyPlugins/API/Tests/APIHostApp
       xcode_version: '14.3'
       resource_subfolder: api
-      timeout-minutes: 30
+      timeout-minutes: 45
     secrets: inherit
diff --git a/.github/workflows/integ_test_datastore_auth_cognito.yml b/.github/workflows/integ_test_datastore_auth_cognito.yml
@@ -42,6 +42,5 @@ jobs:
       project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp
       xcode_version: '14.3'
       resource_subfolder: datastore
-      timeout-minutes: 60
-      other_flags: '-test-iterations 3 -retry-tests-on-failure'
+      timeout-minutes: 120
     secrets: inherit
diff --git a/.github/workflows/integ_test_datastore_auth_iam.yml b/.github/workflows/integ_test_datastore_auth_iam.yml
@@ -42,6 +42,5 @@ jobs:
       project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp
       xcode_version: '14.3'
       resource_subfolder: datastore
-      timeout-minutes: 60
-      other_flags: '-test-iterations 3 -retry-tests-on-failure'
+      timeout-minutes: 120
     secrets: inherit
diff --git a/.github/workflows/integ_test_datastore_base.yml b/.github/workflows/integ_test_datastore_base.yml
@@ -42,6 +42,5 @@ jobs:
       project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp
       xcode_version: '14.3'
       resource_subfolder: datastore
-      timeout-minutes: 60
-      other_flags: '-test-iterations 3 -retry-tests-on-failure'
+      timeout-minutes: 120
     secrets: inherit
diff --git a/.github/workflows/integ_test_datastore_cpk.yml b/.github/workflows/integ_test_datastore_cpk.yml
@@ -42,6 +42,5 @@ jobs:
       project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp
       xcode_version: '14.3'
       resource_subfolder: datastore
-      timeout-minutes: 60
-      other_flags: '-test-iterations 3 -retry-tests-on-failure'
+      timeout-minutes: 120
     secrets: inherit
diff --git a/.github/workflows/integ_test_datastore_lazy_load.yml b/.github/workflows/integ_test_datastore_lazy_load.yml
@@ -42,6 +42,5 @@ jobs:
       project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp
       xcode_version: '14.3'
       resource_subfolder: datastore
-      timeout-minutes: 60
-      other_flags: '-test-iterations 3 -retry-tests-on-failure'
+      timeout-minutes: 120
     secrets: inherit
diff --git a/.github/workflows/integ_test_datastore_multi_auth.yml b/.github/workflows/integ_test_datastore_multi_auth.yml
@@ -42,6 +42,5 @@ jobs:
       project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp
       xcode_version: '14.3'
       resource_subfolder: datastore
-      timeout-minutes: 60
-      other_flags: '-test-iterations 3 -retry-tests-on-failure'
+      timeout-minutes: 120
     secrets: inherit
diff --git a/.github/workflows/integ_test_datastore_v2.yml b/.github/workflows/integ_test_datastore_v2.yml
@@ -42,6 +42,5 @@ jobs:
       project_path: ./AmplifyPlugins/DataStore/Tests/DataStoreHostApp
       xcode_version: '14.3'
       resource_subfolder: datastore
-      timeout-minutes: 60
-      other_flags: '-test-iterations 3 -retry-tests-on-failure'
+      timeout-minutes: 120
     secrets: inherit
diff --git a/.github/workflows/integ_test_push_notifications.yml b/.github/workflows/integ_test_push_notifications.yml
@@ -27,7 +27,7 @@ jobs:
   push-notification-integration-tests:
     name: ${{ matrix.platform }} Tests | PushNotificationHostApp
     runs-on: macos-13
-    timeout-minutes: 45
+    timeout-minutes: 30
     environment: IntegrationTest
     strategy:
       fail-fast: false

diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml
@@ -29,15 +29,6 @@ on:
         description: 'The key used to retrieve the build cache'
         required: true
         type: string
-      if:
-        description: 'Whether to run this job'
-        required: false
-        default: true
-        type: boolean
-      other_flags:
-        required: false
-        type: string
-        default: ''
 
 permissions:
     id-token: write
@@ -47,7 +38,7 @@ jobs:
   integration-tests:
     name: ${{ inputs.platform }} Tests | ${{ inputs.scheme }}
     runs-on: macos-13
-    if: inputs.if && inputs.platform != 'macOS' # macOS is not supported for Integration Tests
+    if: inputs.platform != 'macOS' # macOS is not supported for Integration Tests
     timeout-minutes: ${{ inputs.timeout-minutes }}
     environment: IntegrationTest
     steps:
@@ -110,7 +101,7 @@ jobs:
           derived_data_path: ${{ github.workspace }}/Build
           disable_package_resolution: ${{ steps.dependencies-cache.outputs.cache-hit }}
           test_without_building: false
-          other_flags: ${{ inputs.other_flags }}
+          other_flags: -test-iterations 3 -retry-tests-on-failure
 
       - name: Retry ${{ inputs.platform }} Integration Tests
         if: steps.run-tests.outcome=='failure'
@@ -128,5 +119,4 @@ jobs:
           disable_package_resolution: true
           # Only attempt to test without building when we are not using any cache.
           test_without_building: ${{ !steps.build-cache.outputs.cache-hit }}
-          other_flags: ${{ inputs.other_flags }}
-
+          other_flags: -test-iterations 3 -retry-tests-on-failure