Append veyron_ and auron_ to model names.
BUG=b:131840947
TEST=./upload_cts.py <build_id> <results_dir_path>
TEST=./upload_cts_verifier.py <build_id> <results_dir_path>
Change-Id: Ia2f096866e64e865f693990806a259938dd04b9f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crostestutils/+/1592324
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
Tested-by: Rohit Makasana <rohitbm@chromium.org>
diff --git a/provingground/cts/lib/upload_utils.py b/provingground/cts/lib/upload_utils.py
index 1010297..fd3705a 100755
--- a/provingground/cts/lib/upload_utils.py
+++ b/provingground/cts/lib/upload_utils.py
@@ -258,7 +258,10 @@
build_model = self.build_info_list[-1][2]
build_board = self.build_info_list[-1][1]
build_id_folder = self.build_info_list[-1][3]
- release_folder = '%s.%s-release' % (build_model, build_board)
+ if build_board.startswith('veyron_') or build_board.startswith('auron_'):
+ release_folder = '%s.%s-release' % (build_board, build_board)
+ else:
+ release_folder = '%s.%s-release' % (build_model, build_board)
manual_folder = 'manual'
apfe_path = os.path.join(dir_path, release_folder, build_id_folder,
manual_folder)
@@ -279,7 +282,11 @@
build_board = self.build_info_list[-1][1]
build_model = self.build_info_list[-1][2]
build_id_folder = self.build_info_list[-1][3]
- release_folder = '%s.%s-release' %(build_model, build_board)
+
+ if build_board.startswith('veyron_') or build_board.startswith('auron_'):
+ release_folder = '%s.%s-release' % (build_board, build_board)
+ else:
+ release_folder = '%s.%s-release' %(build_model, build_board)
apfe_path = os.path.join(dir_path, release_folder, build_id_folder)
if not os.path.exists(apfe_path):
os.makedirs(apfe_path)
diff --git a/provingground/cts/upload_cts.py b/provingground/cts/upload_cts.py
index 418809c..2c23d06 100755
--- a/provingground/cts/upload_cts.py
+++ b/provingground/cts/upload_cts.py
@@ -105,14 +105,21 @@
Sample APFE:board.board for non-unibuild.
Sample APFE:model.board for unibuild.
+ Append veyron_ and auron_ to model name for veyron and auron boards.
+ Sample:auron_yuna.auron_yuna-release,veyron_mighty.veyron_mighty-release
Args:
dir_path: Results directory path.
"""
for item in self.build_info_list:
if self.test_board_name != item[1]:
- print('gsutil cp -r {0}/{1}.{2}-release/ gs://chromeos-cts-apfe/'
- .format(dir_path, item[2], item[1]))
+ if item[1].startswith('veyron') or item[1].startswith('auron'):
+ print('gsutil cp -r {0}/{1}.{2}-release/ '
+ 'gs://chromeos-cts-apfe/'
+ .format(dir_path, item[1], item[1]))
+ else:
+ print('gsutil cp -r {0}/{1}.{2}-release/ gs://chromeos-cts-apfe/'
+ .format(dir_path, item[2], item[1]))
print('gsutil cp -r {0}/{1}_{2}/ '
'gs://chromeos-cts-results/manual'
.format(dir_path, item[3], item[1]))
diff --git a/provingground/cts/upload_cts_verifier.py b/provingground/cts/upload_cts_verifier.py
index ea4a24f..29e873c 100755
--- a/provingground/cts/upload_cts_verifier.py
+++ b/provingground/cts/upload_cts_verifier.py
@@ -65,16 +65,23 @@
def PrintGsutilLinks(self, dir_path):
"""Prints gsutil links to upload results to CTS dashboard and APFE buckets.
- CTS-V APFE :model.board for unibuild.
CTS-V APFE :board.board for non-unibuild.
+ CTS-V APFE :model.board for unibuild.
+ Appended veyron_ and auron_ to model name for veyron and auron boards.
+ Sample:auron_yuna.auron_yuna-release,veyron_mighty.veyron_mighty-release
Args:
dir_path: Results directory path.
"""
for item in self.build_info_list:
- gsutil_msg_apfe = ('gsutil cp -r {0}/{1}.{2}-release/ '
- 'gs://chromeos-ctsverifier-results/'
- .format(dir_path, item[2], item[1]))
+ if item[1].startswith('veyron') or item[1].startswith('auron'):
+ gsutil_msg_apfe = ('gsutil cp -r {0}/{1}.{2}-release/ '
+ 'gs://chromeos-ctsverifier-results/'
+ .format(dir_path, item[1], item[1]))
+ else:
+ gsutil_msg_apfe = ('gsutil cp -r {0}/{1}.{2}-release/ '
+ 'gs://chromeos-ctsverifier-results/'
+ .format(dir_path, item[2], item[1]))
gsutil_msg_cts = ('gsutil cp -r {0}/{1}_{2}/ '
'gs://chromeos-cts-results/ctsVerifier'
.format(dir_path, item[3], item[1]))
