From 1593228b685ef763074056f683dc03377dfd75bd Mon Sep 17 00:00:00 2001 From: Craig Russell <1336281+CDRussell@users.noreply.github.com> Date: Mon, 6 Jan 2025 11:05:31 +0000 Subject: [PATCH] Migrate remaining Maestro-Cloud tests to Robin --- .github/workflows/ads-end-to-end.yml | 10 +- .github/workflows/custom-tabs-nightly.yml | 10 +- .github/workflows/e2e-nightly-autofill.yml | 10 +- .github/workflows/end-to-end.yml | 119 ------------------ .../privacy-dashboard-end-to-end.yml | 16 ++- .github/workflows/release_tests.yml | 10 +- .github/workflows/sync-critical-path.yml | 10 +- 7 files changed, 40 insertions(+), 145 deletions(-) delete mode 100644 .github/workflows/end-to-end.yml diff --git a/.github/workflows/ads-end-to-end.yml b/.github/workflows/ads-end-to-end.yml index 859b38a721db..1963cd9522f2 100644 --- a/.github/workflows/ads-end-to-end.yml +++ b/.github/workflows/ads-end-to-end.yml @@ -55,10 +55,12 @@ jobs: run: find . -name "*.apk" -exec mv '{}' apk/release.apk \; - name: ADS Preview Flows - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 + uses: mobile-dev-inc/action-maestro-cloud@v1.9.7 with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} + api-key: ${{ secrets.ROBIN_API_KEY }} + project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }} + name: androidDesignSystem_${{ github.sha }} + timeout: 120 app-file: apk/release.apk workspace: .maestro include-tags: androidDesignSystemTest @@ -71,5 +73,5 @@ jobs: asana-workspace-id: ${{ secrets.GH_ASANA_WORKSPACE_ID }} asana-project-id: ${{ secrets.GH_ASANA_AOR_PROJECT_ID }} asana-section-id: ${{ secrets.GH_ASANA_INCOMING_ID }} - asana-task-name: GH Workflow Failure - ADS Preview test + asana-task-name: GH Workflow Failure - ADS Preview test (Robin) asana-task-description: The ADS Preview end to end workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }} \ No newline at end of file diff --git a/.github/workflows/custom-tabs-nightly.yml b/.github/workflows/custom-tabs-nightly.yml index 7607203396db..007bbd867175 100644 --- a/.github/workflows/custom-tabs-nightly.yml +++ b/.github/workflows/custom-tabs-nightly.yml @@ -55,10 +55,12 @@ jobs: run: find . -name "*.apk" -exec mv '{}' apk/release.apk \; - name: Custom Tabs Flows - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 + uses: mobile-dev-inc/action-maestro-cloud@v1.9.7 with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} + api-key: ${{ secrets.ROBIN_API_KEY }} + project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }} + name: customTabs_${{ github.sha }} + timeout: 120 app-file: apk/release.apk android-api-level: 30 workspace: .maestro @@ -72,6 +74,6 @@ jobs: asana-pat: ${{ secrets.GH_ASANA_SECRET }} asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }} asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }} - asana-task-name: GH Workflow Failure - Custom Tabs Flows + asana-task-name: GH Workflow Failure - Custom Tabs Flows (Robin) asana-task-description: The Custom Tabs nightly workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }} action: 'create-asana-task' \ No newline at end of file diff --git a/.github/workflows/e2e-nightly-autofill.yml b/.github/workflows/e2e-nightly-autofill.yml index ba67fc39b604..0884763bfc7f 100644 --- a/.github/workflows/e2e-nightly-autofill.yml +++ b/.github/workflows/e2e-nightly-autofill.yml @@ -55,10 +55,12 @@ jobs: run: find . -name "*.apk" -exec mv '{}' apk/release.apk \; - name: Autofill Critical Path E2E Flows - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 + uses: mobile-dev-inc/action-maestro-cloud@v1.9.7 with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} + api-key: ${{ secrets.ROBIN_API_KEY }} + project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }} + name: autofill_${{ github.sha }} + timeout: 120 app-file: apk/release.apk android-api-level: 30 workspace: .maestro @@ -72,6 +74,6 @@ jobs: asana-pat: ${{ secrets.GH_ASANA_SECRET }} asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }} asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }} - asana-task-name: GH Workflow Failure - Autofill Critical Path E2E Flows + asana-task-name: GH Workflow Failure - Autofill Critical Path E2E Flows (Robin) asana-task-description: Autofill critical path tests have failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }} action: 'create-asana-task' \ No newline at end of file diff --git a/.github/workflows/end-to-end.yml b/.github/workflows/end-to-end.yml deleted file mode 100644 index 1a8059dca107..000000000000 --- a/.github/workflows/end-to-end.yml +++ /dev/null @@ -1,119 +0,0 @@ -name: End-to-End tests - -on: - schedule: - - cron: '0 4 * * *' # run at 4 AM UTC - workflow_dispatch: - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - instrumentation_tests: - runs-on: ubuntu-latest - name: End-to-End tests - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'adopt' - - - name: Create folder - if: always() - run: mkdir apk - - - name: Decode keys - uses: davidSchuppa/base64Secret-toFile-action@v2 - with: - secret: ${{ secrets.FAKE_RELEASE_PROPERTIES }} - fileName: ddg_android_build.properties - destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/ - - - name: Decode key file - uses: davidSchuppa/base64Secret-toFile-action@v2 - with: - secret: ${{ secrets.FAKE_RELEASE_KEY }} - fileName: android - destination-path: $HOME/jenkins_static/com.duckduckgo.mobile.android/ - - - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - - - name: Assemble release APK - run: ./gradlew assemblePlayRelease -Pforce-default-variant - - - name: Move APK to new folder - if: always() - run: find . -name "*.apk" -exec mv '{}' apk/release.apk \; - - - name: Ad click detection flows - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 - with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} - app-file: apk/release.apk - android-api-level: 30 - workspace: .maestro - include-tags: adClickTest - - - name: Privacy Tests - if: always() - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 - with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} - app-file: apk/release.apk - android-api-level: 30 - workspace: .maestro - include-tags: privacyTest - - - name: Security Tests - if: always() - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 - with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} - app-file: apk/release.apk - android-api-level: 30 - workspace: .maestro - include-tags: securityTest - - - name: Release Tests - if: always() - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 - with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} - app-file: apk/release.apk - android-api-level: 30 - workspace: .maestro - include-tags: releaseTest - - - name: Notifications permissions Android 13+ - if: always() - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 - with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} - app-file: apk/release.apk - android-api-level: 33 - workspace: .maestro/notifications_permissions_android13_plus - - - name: Create Asana task when workflow failed - if: ${{ failure() }} - uses: honeycombio/gha-create-asana-task@main - with: - asana-secret: ${{ secrets.GH_ASANA_SECRET }} - asana-workspace-id: ${{ secrets.GH_ASANA_WORKSPACE_ID }} - asana-project-id: ${{ secrets.GH_ASANA_AOR_PROJECT_ID }} - asana-section-id: ${{ secrets.GH_ASANA_INCOMING_ID }} - asana-task-name: GH Workflow Failure - End to end tests - asana-task-description: The end to end workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }} \ No newline at end of file diff --git a/.github/workflows/privacy-dashboard-end-to-end.yml b/.github/workflows/privacy-dashboard-end-to-end.yml index 7481edac32cf..ec46923f55d6 100644 --- a/.github/workflows/privacy-dashboard-end-to-end.yml +++ b/.github/workflows/privacy-dashboard-end-to-end.yml @@ -58,20 +58,24 @@ jobs: run: find . -name "*.apk" -exec mv '{}' apk/release.apk \; - name: Ad click detection flows - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 + uses: mobile-dev-inc/action-maestro-cloud@v1.9.7 with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} + api-key: ${{ secrets.ROBIN_API_KEY }} + project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }} + name: privacyDashboard_adClickTest_${{ github.sha }} + timeout: 120 app-file: apk/release.apk workspace: .maestro include-tags: adClickTest - name: Privacy Tests if: always() - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 + uses: mobile-dev-inc/action-maestro-cloud@v1.9.7 with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} + api-key: ${{ secrets.ROBIN_API_KEY }} + project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }} + name: privacyDashboard_privacyTest_${{ github.sha }} + timeout: 120 app-file: apk/release.apk workspace: .maestro include-tags: privacyTest diff --git a/.github/workflows/release_tests.yml b/.github/workflows/release_tests.yml index 5e01f3979262..3f0a8306b505 100644 --- a/.github/workflows/release_tests.yml +++ b/.github/workflows/release_tests.yml @@ -62,10 +62,12 @@ jobs: run: find . -name "*.apk" -exec mv '{}' apk/release.apk \; - name: Release tests flows - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 + uses: mobile-dev-inc/action-maestro-cloud@v1.9.7 with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} + api-key: ${{ secrets.ROBIN_API_KEY }} + project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }} + name: releaseTest_${{ github.sha }} + timeout: 120 app-file: apk/release.apk android-api-level: 30 workspace: .maestro @@ -79,6 +81,6 @@ jobs: asana-pat: ${{ secrets.GH_ASANA_SECRET }} asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }} asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }} - asana-task-name: GH Workflow Failure - Tag Android Release + asana-task-name: GH Workflow Failure - Tag Android Release (Robin) asana-task-description: Tag Android Release has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }} action: 'create-asana-task' \ No newline at end of file diff --git a/.github/workflows/sync-critical-path.yml b/.github/workflows/sync-critical-path.yml index 98821661f566..589c43a810bd 100644 --- a/.github/workflows/sync-critical-path.yml +++ b/.github/workflows/sync-critical-path.yml @@ -62,10 +62,12 @@ jobs: run: find . -name "*.apk" -exec mv '{}' apk/release.apk \; - name: Sync Flows - uses: mobile-dev-inc/action-maestro-cloud@v1.8.1 + uses: mobile-dev-inc/action-maestro-cloud@v1.9.7 with: - api-key: ${{ secrets.MOBILE_DEV_API_KEY }} - name: ${{ github.sha }} + api-key: ${{ secrets.ROBIN_API_KEY }} + project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }} + name: sync_${{ github.sha }} + timeout: 120 app-file: apk/release.apk android-api-level: 30 workspace: .maestro @@ -81,7 +83,7 @@ jobs: asana-pat: ${{ secrets.GH_ASANA_SECRET }} asana-project: ${{ vars.GH_ANDROID_APP_PROJECT_ID }} asana-section: ${{ vars.GH_ANDROID_APP_INCOMING_SECTION_ID }} - asana-task-name: GH Workflow Failure - Android Sync Critical Path E2E Flows + asana-task-name: GH Workflow Failure - Android Sync Critical Path E2E Flows (Robin) asana-task-description: The Android Sync Critical Path Flows E2E workflow has failed. See https://github.com/duckduckgo/Android/actions/runs/${{ github.run_id }} action: 'create-asana-task'