init

aws-amplify · Nov 10, 2023 · c900012 · c900012
1 parent 922eb86
commit c900012
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 93 deletions.
diff --git a/.github/canary-config/canary-all.yml b/.github/canary-config/canary-all.yml
@@ -107,13 +107,13 @@ tests:
     sample_name: [websocket-disruption]
     spec: websocket-disruption
     browser: *minimal_browser_list
-  - test_name: integ_next_datastore_owner_auth
-    desc: 'next owner auth'
-    framework: next
-    category: datastore
-    sample_name: [owner-based-default]
-    spec: next-owner-based-default
-    browser: *minimal_browser_list
+  # - test_name: integ_next_datastore_owner_auth # TODO commented
+  #   desc: 'next owner auth'
+  #   framework: next
+  #   category: datastore
+  #   sample_name: [owner-based-default]
+  #   spec: next-owner-based-default
+  #   browser: *minimal_browser_list
   - test_name: integ_next_datastore_13_js
     desc: 'DataStore - Nextjs 13 build with SWC - JS app'
     framework: next
@@ -161,36 +161,35 @@ tests:
     browser: [chrome]
 
     # INTERACTIONS
-  - test_name: integ_react_interactions_react_interactions
-    desc: 'React Interactions'
-    framework: react
-    category: interactions
-    sample_name: [chatbot-component]
-    spec: chatbot-component
-    browser: *minimal_browser_list
+  # - test_name: integ_react_interactions_react_interactions # TODO not required
+  #   desc: 'React Interactions'
+  #   framework: react
+  #   category: interactions
+  #   sample_name: [chatbot-component]
+  #   spec: chatbot-component
+  #   browser: *minimal_browser_list
   - test_name: integ_react_interactions_chatbot_v1
     desc: 'Chatbot V1'
     framework: react
     category: interactions
     sample_name: [lex-test-component]
     spec: chatbot-v1
     browser: *minimal_browser_list
-  - test_name: integ_angular_interactions
-    desc: 'Angular Interactions'
-    framework: angular
-    category: interactions
-    sample_name: [chatbot-component]
-    spec: chatbot-component
-    browser: *minimal_browser_list
-  - test_name: integ_vue_interactions_vue_2_interactions
-    desc: 'Vue 2 Interactions'
-    framework: vue
-    category: interactions
-    sample_name: [chatbot-component]
-    spec: chatbot-component
-    browser: [chrome]
-
-    # PREDICTIONS
+  # - test_name: integ_angular_interactions # TODO commented
+  #   desc: 'Angular Interactions'
+  #   framework: angular
+  #   category: interactions
+  #   sample_name: [chatbot-component]
+  #   spec: chatbot-component
+  #   browser: *minimal_browser_list
+  # - test_name: integ_vue_interactions_vue_2_interactions # TODO commented
+  #   desc: 'Vue 2 Interactions'
+  #   framework: vue
+  #   category: interactions
+  #   sample_name: [chatbot-component]
+  #   spec: chatbot-component
+  #   browser: [chrome]
+  # PREDICTIONS
   - test_name: integ_react_predictions
     desc: 'React Predictions'
     framework: react
@@ -250,20 +249,20 @@ tests:
     browser: *minimal_browser_list
 
     # AUTH
-  - test_name: integ_react_auth_1_react_authenticator
-    desc: 'React Authenticator'
-    framework: react
-    category: auth
-    sample_name: [amplify-authenticator]
-    spec: new-ui-authenticator
-    browser: *minimal_browser_list
-  - test_name: integ_react_auth_2_react_credentials_different_region
-    desc: 'React Credentials Different Region'
-    framework: react
-    category: auth
-    sample_name: [credentials-auth]
-    spec: credentials-auth
-    browser: *minimal_browser_list
+  # - test_name: integ_react_auth_1_react_authenticator #TODO commented
+  #   desc: 'React Authenticator'
+  #   framework: react
+  #   category: auth
+  #   sample_name: [amplify-authenticator]
+  #   spec: new-ui-authenticator
+  #   browser: *minimal_browser_list
+  # - test_name: integ_react_auth_2_react_credentials_different_region #TODO commented
+  #   desc: 'React Credentials Different Region'
+  #   framework: react
+  #   category: auth
+  #   sample_name: [credentials-auth]
+  #   spec: credentials-auth
+  #   browser: *minimal_browser_list
   - test_name: integ_react_device_tracking
     desc: 'cognito-device-tracking'
     framework: react
@@ -278,28 +277,28 @@ tests:
     sample_name: [delete-user]
     spec: delete-user
     browser: *minimal_browser_list
-  - test_name: integ_angular_auth_angular_authenticator
-    desc: 'Angular Authenticator'
-    framework: angular
-    category: auth
-    sample_name: [amplify-authenticator]
-    spec: ui-amplify-authenticator
-    browser: *minimal_browser_list
-  - test_name: integ_javascript_auth
-    desc: 'JavaScript Auth CDN'
-    framework: javascript
-    category: auth
-    sample_name: [auth-cdn]
-    spec: auth-cdn
-    browser: *minimal_browser_list
-    amplifyjs_dir: true
-  - test_name: integ_vue_auth_legacy_vue_authenticator
-    desc: 'Legacy Vue Authenticator'
-    framework: vue
-    category: auth
-    sample_name: [amplify-authenticator-legacy]
-    spec: authenticator
-    browser: *minimal_browser_list
+  # - test_name: integ_angular_auth_angular_authenticator #TODO commented
+  #   desc: 'Angular Authenticator'
+  #   framework: angular
+  #   category: auth
+  #   sample_name: [amplify-authenticator]
+  #   spec: ui-amplify-authenticator
+  #   browser: *minimal_browser_list
+  # - test_name: integ_javascript_auth #TODO commented
+  #   desc: 'JavaScript Auth CDN'
+  #   framework: javascript
+  #   category: auth
+  #   sample_name: [auth-cdn]
+  #   spec: auth-cdn
+  #   browser: *minimal_browser_list
+  #   amplifyjs_dir: true
+  # - test_name: integ_vue_auth_legacy_vue_authenticator #TODO commented
+  #   desc: 'Legacy Vue Authenticator'
+  #   framework: vue
+  #   category: auth
+  #   sample_name: [amplify-authenticator-legacy]
+  #   spec: authenticator
+  #   browser: *minimal_browser_list
   - test_name: integ_next_auth_authenticator_and_ssr_page
     desc: 'Authenticator and SSR page'
     framework: next

diff --git a/.github/workflows/callable-canary-e2e.yml b/.github/workflows/callable-canary-e2e.yml
@@ -12,35 +12,35 @@ jobs:
     uses: ./.github/workflows/callable-prebuild-amplify-js.yml
     with:
       runs_on: ubuntu-latest
-  prebuild-macos:
-    uses: ./.github/workflows/callable-prebuild-amplify-js.yml
-    with:
-      runs_on: macos-latest
+  #   prebuild-macos:
+  #     uses: ./.github/workflows/callable-prebuild-amplify-js.yml
+  #     with:
+  #       runs_on: macos-latest
   prebuild-samples-staging:
     secrets: inherit
     uses: ./.github/workflows/callable-prebuild-samples-staging.yml
   e2e:
     needs:
-      - prebuild-macos
+      #   - prebuild-macos
       - prebuild-ubuntu
       - prebuild-samples-staging
     secrets: inherit
     uses: ./.github/workflows/callable-canary-e2e-runner.yml
-  sample-app-tests:
-    secrets: inherit
-    uses: ./.github/workflows/callable-canary-sampleapp-tests.yml
-  slack-alert:
-    needs:
-      - e2e
-      - sample-app-tests
-    runs-on: ubuntu-latest
-    if: failure()
-    steps:
-      - name: Send slack message
-        env:
-          WORKFLOW_URL: '{ "URL": "${{ env.WORKFLOW_URL }}" }'
-          WEBHOOK_URL: ${{ env.WEBHOOK_URL }}
-        run: |
-          curl -X POST -H "Content-Type: application/json" \
-          --data "$WORKFLOW_URL" \
-          $WEBHOOK_URL
+#   sample-app-tests:
+#     secrets: inherit
+#     uses: ./.github/workflows/callable-canary-sampleapp-tests.yml
+#   slack-alert:
+#     needs:
+#       - e2e
+#       - sample-app-tests
+#     runs-on: ubuntu-latest
+#     if: failure()
+#     steps:
+#       - name: Send slack message
+#         env:
+#           WORKFLOW_URL: '{ "URL": "${{ env.WORKFLOW_URL }}" }'
+#           WEBHOOK_URL: ${{ env.WEBHOOK_URL }}
+#         run: |
+#           curl -X POST -H "Content-Type: application/json" \
+#           --data "$WORKFLOW_URL" \
+#           $WEBHOOK_URL
diff --git a/.github/workflows/on-schedule-canary-test.yml b/.github/workflows/on-schedule-canary-test.yml
@@ -1,8 +1,12 @@
+concurrency:
+  # group name unique for push to push-integ-test
+  group: ashwin-canary-main-fix-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
-  # Tests scheduled at 4pm(UTC) / 9am(PDT) everyday
-  # default supported timezone is UTC
-  schedule:
-    - cron: '0 16 * * *'
+  push:
+    branches:
+      - ashwin-canary-main-fix
 
 jobs:
   canaries: