android: split out artifacts spec from build target dict
Move artifacts spec to service.android since it's only used there.
This also eliminates references to ebuild variables in service.android.
Added unit tests to ensure we don't miss configure artifacts for
supported Android branches / build targets.
BUG=b:183180422
BUG=chromium:1192431
TEST=run_pytest
TEST=cros_mark_android_as_stable \
--android_build_branch git_rvc-arc \
--android_package android-vm-rvc -f 7225981
Change-Id: I0c7a86b6dbf78506abd0179cc08f4e120baa6e1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2783769
Tested-by: Shao-Chuan Lee <shaochuan@chromium.org>
Commit-Queue: Shao-Chuan Lee <shaochuan@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/scripts/cros_mark_android_as_stable.py b/scripts/cros_mark_android_as_stable.py
index 0d524ed..2725d02 100644
--- a/scripts/cros_mark_android_as_stable.py
+++ b/scripts/cros_mark_android_as_stable.py
@@ -266,8 +266,8 @@
build_targets = constants.ANDROID_BRANCH_TO_BUILD_TARGETS[build_branch]
variables = {'BASE_URL': arc_bucket_url}
- for build, (target, _) in build_targets.items():
- variables[build + '_TARGET'] = f'{build_branch}-linux-{target}'
+ for var, target in build_targets.items():
+ variables[var] = f'{build_branch}-linux-{target}'
variables.update(UpdateDataCollectorArtifacts(
android_version, runtime_artifacts_bucket_url, build_branch))