Issue mozilla-mobile#10070: Update automation for sample browser.

Author: pocmo

taskcluster/ac_taskgraph/loader/build_config.py

@@ -30,11 +30,6 @@
 CONFIGURATIONS_WITH_DEPENDENCIES = (
     "api",
     "compileOnly",
-# This seem like they should be included as well (because of https://github.com/mozilla-mobile/android-components/blob/2bc8627e160196c544bb8584cf926765fce4889c/samples/browser/build.gradle#L131)
-# but gradle doesn't accept them as a configuration for some reason.
-#    "geckoNightlyImplementation",
-#    "geckoBetaImplementation",
-#    "geckoReleaseImplementation",
     "implementation",
     "testImplementation"
 )

taskcluster/ci/build-samples-browser/kind.yml

@@ -40,29 +40,14 @@ job-defaults:
         max-run-time: 1200
 
 jobs:
-    nightly:
+    gecko:
         run:
             gradlew:
-                - ':samples-browser:assembleGeckoNightly'
-                - ':samples-browser:testGeckoNightlyDebugUnitTest'
-                - ':samples-browser:lintGeckoNightly'
+                - ':samples-browser:assembleGecko'
+                - ':samples-browser:testGeckoDebugUnitTest'
+                - ':samples-browser:lintGecko'
         treeherder:
             symbol: 'samples-browser(B)'
-    beta:
-        run:
-            gradlew:
-                - ':samples-browser:assembleGeckoBeta'
-                - ':samples-browser:testGeckoBetaDebugUnitTest'
-        treeherder:
-            symbol: 'samples-browser-beta(B)'
-
-    release:
-        run:
-            gradlew:
-                - ':samples-browser:assembleGeckoRelease'
-                - ':samples-browser:testGeckoReleaseDebugUnitTest'
-        treeherder:
-            symbol: 'samples-browser-release(B)'
 
     system:
         run:

taskcluster/ci/build/kind.yml

@@ -130,16 +130,6 @@ job-defaults:
 
 overriden-jobs:
     # Treeherder group names are too long to fit in 25 chars
-    browser-engine-gecko-nightly:
-        treeherder:
-            symbol: 'browser-engine-gecko-nigh(B)'
-    nightly-browser-engine-gecko-nightly:
-        treeherder:
-            symbol: 'browser-engine-gecko-nigh(BN)'
-    release-browser-engine-gecko-nightly:
-        treeherder:
-            symbol: 'browser-engine-gecko-nigh(BR)'
-
     lib-fetch-httpurlconnection:
         treeherder:
             symbol: 'lib-fetch-httpurlconnect(B)'

taskcluster/ci/config.yml

@@ -75,10 +75,6 @@ treeherder:
         lib-push-amazon: lib-push-amazon
         lib-push-firebase: lib-push-firebase
         lib-state: lib-state
-        samples-browser-beta: samples-browser-beta
-        samples-browser-release: samples-browser-release
-        samples-browser-system: samples-browser-system
-        samples-browser: samples-browser
         samples-crash: samples-crash
         samples-dataprotect: samples-dataprotect
         samples-firefox-accounts: samples-firefox-accounts
@@ -128,8 +124,7 @@ treeherder:
 
         # Groups aren't generated off buildconfig.yml:
         samples-browser: samples-browser
-        samples-browser-beta: samples-browser-beta
-        samples-browser-release: samples-browser-release
+        samples-browser-gecko: samples-browser-gecko
         samples-browser-system: samples-browser-system
 
 

taskcluster/ci/test/kind.yml

@@ -22,7 +22,7 @@ job-defaults:
             - android-gradle-dependencies
     run:
         # TODO Generate APKs in a build task instead
-        gradlew: ['clean', 'assembleGeckoNightly', 'assembleAndroidTest', 'assembleDebug']
+        gradlew: ['clean', 'assembleGecko', 'assembleAndroidTest', 'assembleDebug']
         secrets:
             - name: project/mobile/android-components/firebase
               key: firebaseToken