Revert "Switch to a fixed chrome version temporarily" This reverts commit fa70b7d4093ae28fc23ff5d0ea4cbbd206d656f0. Reason for revert: Undo the version lock and see if we can fix the issue with "concurrency: 1" setting Change-Id: I60d806982fb82db240567f972944b8cb00910f9f
diff --git a/recipes/recipes/gerrit.expected/polygerrit-ui_changes with failed step.json b/recipes/recipes/gerrit.expected/polygerrit-ui_changes with failed step.json index 1aac188..17eb299 100644 --- a/recipes/recipes/gerrit.expected/polygerrit-ui_changes with failed step.json +++ b/recipes/recipes/gerrit.expected/polygerrit-ui_changes with failed step.json
@@ -62,6 +62,36 @@ }, { "cmd": [ + "vpython3", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[CLEANUP]/chrome_tmp_1/LAST_CHANGE", + "/path/to/tmp/" + ], + "infra_step": true, + "luci_context": { + "realm": { + "name": "gerrit:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, + "name": "get chrome.read latest chrome version", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_END@LAST_CHANGE@@@" + ] + }, + { + "cmd": [ "python3", "-u", "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py", @@ -69,7 +99,7 @@ "RECIPE_REPO[depot_tools]/gsutil.py", "----", "cp", - "gs://chromium-browser-snapshots/Linux_x64/1283771/chrome-linux.zip", + "gs://chromium-browser-snapshots/Linux_x64//chrome-linux.zip", "[CLEANUP]/chrome_tmp_1" ], "infra_step": true,
diff --git a/recipes/recipes/gerrit.expected/polygerrit-ui_changes.json b/recipes/recipes/gerrit.expected/polygerrit-ui_changes.json index e92b77b..b29d21f 100644 --- a/recipes/recipes/gerrit.expected/polygerrit-ui_changes.json +++ b/recipes/recipes/gerrit.expected/polygerrit-ui_changes.json
@@ -62,6 +62,36 @@ }, { "cmd": [ + "vpython3", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", + "[CLEANUP]/chrome_tmp_1/LAST_CHANGE", + "/path/to/tmp/" + ], + "infra_step": true, + "luci_context": { + "realm": { + "name": "gerrit:try" + }, + "resultdb": { + "current_invocation": { + "name": "invocations/build:8945511751514863184", + "update_token": "token" + }, + "hostname": "rdbhost" + } + }, + "name": "get chrome.read latest chrome version", + "~followup_annotations": [ + "@@@STEP_NEST_LEVEL@1@@@", + "@@@STEP_LOG_END@LAST_CHANGE@@@" + ] + }, + { + "cmd": [ "python3", "-u", "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py", @@ -69,7 +99,7 @@ "RECIPE_REPO[depot_tools]/gsutil.py", "----", "cp", - "gs://chromium-browser-snapshots/Linux_x64/1283771/chrome-linux.zip", + "gs://chromium-browser-snapshots/Linux_x64//chrome-linux.zip", "[CLEANUP]/chrome_tmp_1" ], "infra_step": true,
diff --git a/recipes/recipes/gerrit.py b/recipes/recipes/gerrit.py index 98f6c7c..f845b05 100644 --- a/recipes/recipes/gerrit.py +++ b/recipes/recipes/gerrit.py
@@ -88,8 +88,8 @@ chrome_zip = 'chrome-linux.zip' api.gsutil.download(gs_bucket, '%s/%s' % (gs_path, version_file), chrome) - # Using a fixed version to debug an issue. - version = "1283771" + version = api.file.read_text('read latest chrome version', + chrome.join(version_file)) api.gsutil.download(gs_bucket, '%s/%s/%s' % (gs_path, version, chrome_zip), chrome) api.zip.unzip('unzip chrome', chrome.join(