diff options
author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2016-11-03 14:00:12 +0530 |
---|---|---|
committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2016-11-03 14:02:04 +0530 |
commit | 342fbf920f01da2ee30f120635e18983656f9c57 (patch) | |
tree | 3e12317ce71b11b8b02712e0a79248b6869704ff | |
parent | e51360d2019de8512ae88dc730450dd578d26b41 (diff) |
android: remove product map and device type
Now we don't have generic job templates where we insert
device type. Each device type has its own test plans so
removing all the logic related to device mapping. We have
been adding entries in the map recently but we don't use it
at all. None of the current test plan templates have DUT_TYPE
in them.
Change-Id: I0de7ef500221dd84022da8b94e90caf8e3264329
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rwxr-xr-x | post-build-lava.py | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/post-build-lava.py b/post-build-lava.py index 295c480..f7937b1 100755 --- a/post-build-lava.py +++ b/post-build-lava.py @@ -51,52 +51,6 @@ ci_base_url = 'https://ci.linaro.org/jenkins/job/' # Snapshots base URL snapshots_url = 'https://snapshots.linaro.org' -# Map a TARGET_PRODUCT to LAVA parameters. -product_map = { - "vexpress": { - "test_device_type": "vexpress-a9", - }, - "vexpress_rtsm": { - "test_device_type": "rtsm_ve-a15x4-a7x4", - }, - "juno": { - "test_device_type": "wg", - "test_stream": "/private/team/wg/wg-private/", - }, - "fvp": { - "test_device_type": "rtsm_fvp_base-aemv8a", - }, - "full_jacinto6evm": { - "test_device_type": "vayu", - }, - "fujitsu": { - "test_device_type": "aa9", - "test_stream": "/private/team/fujitsu/ci-LT-Fujitsu-working-tree/" - }, - "aosp_manta": { - "test_device_type": "nexus10", - }, - "aosp_flounder": { - "test_device_type": "nexus9", - }, - "apm": { - "test_device_type": "mustang", - }, - "aosp_bullhead": { - "test_device_type": "nexus5x", - }, - "hikey": { - "test_device_type": "hi6220-hikey", - }, - "db410c": { - "test_device_type": "apq8016-sbc", - }, - "x15": { - "test_device_type": "x15", - }, -} - - class LAVADeviceBase(object): """ Base class for definition of the device type and target in lava job. @@ -283,43 +237,6 @@ def replace(fp, pattern, subst): fileinput.close() -def get_lava_device_type_or_target(): - ''' - Here we support the specification by both, - LAVA_DEVICE or LAVA_DEVICE_TYPE, and we can specify - both of them at the same time. - ''' - devices = [] - - # allow to submit to a specific device - test_device = os.environ.get('LAVA_DEVICE') - if test_device: - targets = test_device.split(',') - for dev_target in targets: - dev_target = dev_target.strip() - if dev_target: - devices.append(LAVADeviceTarget(name=dev_target)) - - # allow overload lava device_type by build config - test_device_type = os.environ.get('LAVA_DEVICE_TYPE') - - target_product = os.environ.get('TARGET_PRODUCT') - # only use the default device type when neither of - # LAVA_DEVICE or LAVA_DEVICE_TYPE is specified. - # or say we will not use the value when any of - # LAVA_DEVICE or LAVA_DEVICE_TYPE is specified. - if (not test_device_type) and (not test_device): - test_device_type = product_map[target_product]["test_device_type"] - if test_device_type: - types = test_device_type.split(',') - for dev_type in types: - dev_type = dev_type.strip() - if dev_type: - devices.append(LAVADeviceType(name=dev_type)) - - return devices - - def submit_job_from_url(): """This routine updates a predefined job with the parameters specific to this particular build""" @@ -376,17 +293,10 @@ def submit_job_from_url(): replace("job.json", "%%WA2_JOB_NAME%%", build_number) replace("job.json", "%%DOWNLOAD_URL%%", download_url) - devices = get_lava_device_type_or_target() - # LAVA server URL lava_server = os.environ.get('LAVA_SERVER', 'validation.linaro.org/RPC2/') - device = None - if len(devices) > 0: - device = devices[0]; - - replace("job.json", "%%DUT_TYPE%%", device.name) with open("job.json", 'r') as fin: print fin.read() with open("job.json") as fd: |