Revert "Run UI tests nightly def (mozilla-mobile#17513)"

This reverts commit 06c1734.
isabelrios · Feb 2, 2021 · 4ecc0c1 · 4ecc0c1
1 parent 824f3fd
commit 4ecc0c1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 33 deletions.
diff --git a/automation/taskcluster/androidTest/flank-x86-start-test.yml b/automation/taskcluster/androidTest/flank-x86-start-test.yml
@@ -42,9 +42,7 @@ gcloud:
 
 flank:
   project: GOOGLE_PROJECT
-  # test shards - the amount of groups to split the test suite into
-  # set to -1 to use one shard per test.
-  max-test-shards: 1
   # num-test-runs: the amount of times to run the tests.
   # 1 runs the tests once. 10 runs all the tests 10x
   num-test-runs: 1
+
diff --git a/automation/taskcluster/androidTest/ui-test.sh b/automation/taskcluster/androidTest/ui-test.sh
@@ -76,7 +76,7 @@ set +e
 
 if [[ "${device_type}" =~ ^(arm64-v8a|armeabi-v7a|x86_64|x86)$ ]]; then
     flank_template="${PATH_TEST}/flank-${device_type}.yml"
-elif [[ "${device_type}" == "x86-start-nightly-test" ]]; then
+elif [[ "${device_type}" == "x86-start-test" ]]; then
     flank_template="${PATH_TEST}/flank-x86-start-test.yml"
 elif [[ "${device_type}" == "arm-start-test" ]]; then
     flank_template="${PATH_TEST}/flank-armeabi-v7a-start-test.yml"

diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
@@ -63,15 +63,6 @@ jobs:
         treeherder:
             symbol: beta(Bf)
 
-    nightly-firebase:
-        disable-optimization: true
-        run-on-tasks-for: [github-push] # We want this on push so that we detect problem before triggering a new beta
-        run:
-            gradle-build-type: nightly
-            test-build-type: nightly
-        treeherder:
-            symbol: nightly(Bf)
-
     android-test-debug:
         attributes:
             code-review: true
@@ -94,16 +85,13 @@ jobs:
     android-test-nightly:
         attributes:
             nightly: true
+        run:
+            gradle-build-type: androidTest
         apk-artifact-template:
             # 2 differences here:
             #  * "androidTest/" is added
             #  * "{gradle_build_type}" is forced to "debug"
-            path: '/builds/worker/checkouts/src/app/build/outputs/apk/androidTest/nightly/app-nightly-androidTest.apk'
-        disable-optimization: true
-        run:
-            gradle-build-type: androidTest
-            test-build-type: nightly
-        run-on-tasks-for: [github-push]
+            path: '/builds/worker/checkouts/src/app/build/outputs/apk/androidTest/debug/{fileName}'
         treeherder:
             symbol: nightly(Bat)
 

diff --git a/taskcluster/ci/signing/kind.yml b/taskcluster/ci/signing/kind.yml
@@ -56,7 +56,6 @@ job-template:
             by-build-type:
                 android-test.+: Bats
                 beta-firebase: Bfs
-                nightly-firebase: Bfs
                 default: Bs
         kind: build
         platform: android-all/opt

diff --git a/taskcluster/ci/ui-test/kind.yml b/taskcluster/ci/ui-test/kind.yml
@@ -80,16 +80,3 @@ jobs:
                 - [automation/taskcluster/androidTest/ui-test.sh, x86-beta-tests, app.apk, android-test.apk, '50']
         treeherder:
             symbol: beta(ui-test-x86-beta)
-    x86-nightly:
-        attributes:
-            build-type: nightly-firebase
-        description: Test Fenix
-        run-on-tasks-for: [github-push]
-        dependencies:
-            signing: signing-nightly-firebase
-            signing-android-test: signing-android-test-nightly
-        run:
-            commands:
-                - [automation/taskcluster/androidTest/ui-test.sh, x86-start-nightly-test, app.apk, android-test.apk, '-1']
-        treeherder:
-            symbol: nightly(ui-test-x86-nightly)