diff options
author | Wenshan Fu <wenshan@google.com> | 2023-08-23 05:58:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-23 05:58:04 +0000 |
commit | 4313fb0e870d16100fbe2242bb6a74cd299134e6 (patch) | |
tree | 52d699b542c3fe2589f011b5b2b48420caaa7a97 | |
parent | eec74017f04c94201ca62de487f27878ed47546a (diff) | |
parent | 3aab71098271817299c196385ea1871bef768662 (diff) | |
download | suite_harness-4313fb0e870d16100fbe2242bb6a74cd299134e6.tar.gz |
Add an option 'has-server-side-config' am: 6ede4f47c7 am: 0327a7112b am: 3aab710982
Original change: https://android-review.googlesource.com/c/platform/test/suite_harness/+/2719415
Change-Id: I71f7fa6ad4842854aea9508e34c48d6e608e1aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 files changed, 9 insertions, 5 deletions
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java index 594df02e..7a99c0f6 100644 --- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java +++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java @@ -77,6 +77,11 @@ public class DynamicConfigPusher extends BaseTargetPreparer private String mConfigUrl = "https://androidpartner.googleapis.com/v1/dynamicconfig/" + "suites/{suite-name}/modules/{module}/version/{version}?key={api-key}"; + @Option( + name = "has-server-side-config", + description = "Whether there exists a service side dynamic config.") + private boolean mHasServerSideConfig = true; + @Option(name="config-filename", description = "The module name for module-level " + "configurations, or the suite name for suite-level configurations") private String mModuleName = null; @@ -281,6 +286,9 @@ public class DynamicConfigPusher extends BaseTargetPreparer @VisibleForTesting String resolveUrl(String suiteName) throws TargetSetupError { + if (!mHasServerSideConfig) { + return null; + } try { String configUrl = UrlReplacement.getDynamicConfigServerUrl() == null diff --git a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusherTest.java b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusherTest.java index 55b8e20f..06968ae3 100644 --- a/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusherTest.java +++ b/common/host-side/tradefed/tests/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusherTest.java @@ -248,13 +248,9 @@ public class DynamicConfigPusherTest { return super.mergeConfigFiles( localConfigFile, apfeConfigInJson, moduleName, device); } - - @Override - String resolveUrl(String suiteName) throws TargetSetupError { - return null; - } }; OptionSetter setter = new OptionSetter(mPreparer); + setter.setOptionValue("has-server-side-config", "false"); setter.setOptionValue("config-filename", "moduleName"); setter.setOptionValue("extract-from-resource", "true"); // Look up the file under that name instead of the config-filename |