Bug 1831168 - rename built apk artifact to target.{abi}.apk

Instead of including the product name and abi as directories containing a target.apk, remove the product name entirely and put the abi in the filename directly. The main motivation is to make the beetmover manifest simpler when adding focus/klar because all signing tasks now have the same artifact names.
mozilla-releng · May 4, 2023 · 0b53789 · 0b53789
1 parent 9b41c2f
commit 0b53789
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/docs/shared/android/device_testing.md b/docs/shared/android/device_testing.md
@@ -24,8 +24,8 @@ Find the line where it downloads the `target.apk` produced in a previous step an
 ```patch
   run:
       commands:
--         - [wget, {artifact-reference: '<signing/public/build/x86/target.apk>'}, '-O', app.apk]
-+         - [wget, {artifact-reference: '<signing/public/build/arm64-v8a/target.apk>'}, '-O', app.apk]
+-         - [wget, {artifact-reference: '<signing/public/build/target.x86.apk>'}, '-O', app.apk]
++         - [wget, {artifact-reference: '<signing/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
 ```
 
 Then look for the line where it invokes the `ui-test.sh` and tell it to use `arm64-v8a` again:

diff --git a/taskcluster/android_taskgraph/manifests/fenix_releases.yml b/taskcluster/android_taskgraph/manifests/fenix_releases.yml
@@ -61,25 +61,25 @@ default: &default
     checksums_path: "TODO"
 
 mapping:
-    fenix/arm64-v8a/target.apk:
+    target.arm64-v8a.apk:
         <<: *default
         description: "Android package for arm64-v8a"
         pretty_name: fenix-${version}.${locale}.android-arm64-v8a.apk
         destinations:
             - ${folder_prefix}fenix-${version}-android-arm64-v8a
-    fenix/armeabi-v7a/target.apk:
+    target.armeabi-v7a.apk:
         <<: *default
         description: "Android package for armeabi-v7a"
         pretty_name: fenix-${version}.${locale}.android-armeabi-v7a.apk
         destinations:
             - ${folder_prefix}fenix-${version}-android-armeabi-v7a
-    fenix/x86/target.apk:
+    target.x86.apk:
         <<: *default
         description: "Android package for x86"
         pretty_name: fenix-${version}.${locale}.android-x86.apk
         destinations:
             - ${folder_prefix}fenix-${version}-android-x86
-    fenix/x86_64/target.apk:
+    target.x86_64.apk:
         <<: *default
         description: "Android package for x86_64"
         pretty_name: fenix-${version}.${locale}.android-x86_64.apk

diff --git a/taskcluster/ci/build-apk/kind.yml b/taskcluster/ci/build-apk/kind.yml
@@ -17,7 +17,7 @@ kind-dependencies:
 task-defaults:
     apk-artifact-template:
         type: file
-        name: 'public/build/{gradle_build}/{abi}/target.apk'
+        name: 'public/build/target.{abi}.apk'
         github-name: '{gradle_build}-{version}-{abi}.apk'
         path: '/builds/worker/checkouts/vcs/{source_project_name}/app/build/outputs/apk/{gradle_build}/{gradle_build_type}/{fileName}'
     fetches:

diff --git a/taskcluster/ci/startup-test/kind.yml b/taskcluster/ci/startup-test/kind.yml
@@ -51,8 +51,8 @@ tasks:
             pre-commands:
                 - ["cd", "fenix"]
             commands:
-                - [wget, {artifact-reference: '<signing/public/build/fenix/arm64-v8a/target.apk>'}, '-O', app.apk]
-                - [wget, {artifact-reference: '<signing-android-test/public/build/fenix/noarch/target.apk>'}, '-O', android-test.apk]
+                - [wget, {artifact-reference: '<signing/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
+                - [wget, {artifact-reference: '<signing-android-test/public/build/target.noarch.apk>'}, '-O', android-test.apk]
                 - [automation/taskcluster/androidTest/ui-test.sh, arm-start-test, app.apk, android-test.apk, '1']
         treeherder:
             symbol: fenix-nightly(startup-arm)
diff --git a/taskcluster/ci/ui-test-apk/kind.yml b/taskcluster/ci/ui-test-apk/kind.yml
@@ -113,7 +113,7 @@ tasks:
             pre-commands:
                 - ["cd", "focus-android"]
             commands:
-                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/focus/arm64-v8a/target.apk>'}, '-O', app.apk]
+                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
                 # TODO: Use the same path as fenix
                 - [wget, {artifact-reference: '<signed-apk-android-test/public/build/app-focus-androidTest.apk>'}, '-O', android-test.apk]
                 - ['automation/taskcluster/androidTest/ui-test.sh', 'arm64-v8a', 'app.apk', 'android-test.apk', '50']
@@ -146,7 +146,7 @@ tasks:
             pre-commands:
                 - ["cd", "focus-android"]
             commands:
-                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/focus/arm64-v8a/target.apk>'}, '-O', app.apk]
+                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
                 # TODO: Use the same path as fenix
                 - [wget, {artifact-reference: '<signed-apk-android-test/public/build/app-focus-androidTest.apk>'}, '-O', android-test.apk]
                 - ['automation/taskcluster/androidTest/ui-test.sh', 'arm-start-test', 'app.apk', 'android-test.apk', '1']
@@ -175,7 +175,7 @@ tasks:
             pre-commands:
                 - ["cd", "focus-android"]
             commands:
-                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/focus/arm64-v8a/target.apk>'}, '-O', app.apk]
+                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
                 # TODO: Use the same path as fenix
                 - [wget, {artifact-reference: '<signed-apk-android-test/public/build/app-focus-androidTest.apk>'}, '-O', android-test.apk]
                 - ['automation/taskcluster/androidTest/ui-test.sh', 'arm-beta-tests', 'app.apk', 'android-test.apk', '1']
@@ -203,8 +203,8 @@ tasks:
             pre-commands:
                 - ["cd", "fenix"]
             commands:
-                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/fenix/arm64-v8a/target.apk>'}, '-O', app.apk]
-                - [wget, {artifact-reference: '<signed-apk-android-test/public/build/fenix/noarch/target.apk>'}, '-O', android-test.apk]
+                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
+                - [wget, {artifact-reference: '<signed-apk-android-test/public/build/target.noarch.apk>'}, '-O', android-test.apk]
                 - [automation/taskcluster/androidTest/ui-test.sh, arm64-v8a, app.apk, android-test.apk, '100']
         treeherder:
             platform: 'fenix-ui-test/opt'
@@ -232,8 +232,8 @@ tasks:
             pre-commands:
                 - ["cd", "fenix"]
             commands:
-                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/fenix/arm64-v8a/target.apk>'}, '-O', app.apk]
-                - [wget, {artifact-reference: '<signed-apk-android-test/public/build/fenix/noarch/target.apk>'}, '-O', android-test.apk]
+                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
+                - [wget, {artifact-reference: '<signed-apk-android-test/public/build/target.noarch.apk>'}, '-O', android-test.apk]
                 - [automation/taskcluster/androidTest/ui-test.sh, arm-screenshots-tests, app.apk, android-test.apk, '1']
         treeherder:
             platform: 'fenix-ui-test/opt'
@@ -260,8 +260,8 @@ tasks:
             pre-commands:
                 - ["cd", "fenix"]
             commands:
-                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/fenix/arm64-v8a/target.apk>'}, '-O', app.apk]
-                - [wget, {artifact-reference: '<signed-apk-android-test/public/build/fenix/noarch/target.apk>'}, '-O', android-test.apk]
+                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
+                - [wget, {artifact-reference: '<signed-apk-android-test/public/build/target.noarch.apk>'}, '-O', android-test.apk]
                 - [automation/taskcluster/androidTest/ui-test.sh, arm-beta-tests, app.apk, android-test.apk, '2']
         treeherder:
             platform: 'fenix-ui-test/opt'
@@ -288,8 +288,8 @@ tasks:
             pre-commands:
                 - ["cd", "fenix"]
             commands:
-                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/fenix/arm64-v8a/target.apk>'}, '-O', app.apk]
-                - [wget, {artifact-reference: '<signed-apk-android-test/public/build/fenix/noarch/target.apk>'}, '-O', android-test.apk]
+                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
+                - [wget, {artifact-reference: '<signed-apk-android-test/public/build/target.noarch.apk>'}, '-O', android-test.apk]
                 - [automation/taskcluster/androidTest/ui-test.sh, arm-start-test, app.apk, android-test.apk, '2']
         treeherder:
             platform: 'fenix-ui-test/opt'
@@ -317,8 +317,8 @@ tasks:
             pre-commands:
                 - ["cd", "fenix"]
             commands:
-                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/fenix/arm64-v8a/target.apk>'}, '-O', app.apk]
-                - [wget, {artifact-reference: '<signed-apk-android-test/public/build/fenix/noarch/target.apk>'}, '-O', android-test.apk]
+                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
+                - [wget, {artifact-reference: '<signed-apk-android-test/public/build/target.noarch.apk>'}, '-O', android-test.apk]
                 - [automation/taskcluster/androidTest/ui-test.sh, arm-legacy-api-tests, app.apk, android-test.apk, '50']
         treeherder:
             platform: 'fenix-ui-test/opt'
@@ -345,7 +345,7 @@ tasks:
             pre-commands:
                 - ["cd", "fenix"]
             commands:
-                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/fenix/arm64-v8a/target.apk>'}, '-O', app.apk]
+                - [wget, {artifact-reference: '<signed-apk-debug-apk/public/build/target.arm64-v8a.apk>'}, '-O', app.apk]
                 - [automation/taskcluster/androidTest/robo-test.sh, arm-robo-test, app.apk]
         treeherder:
             platform: 'fenix-ui-test/opt'