Reland "[sdk] Ensure branch HEAD is fetched locally"
This reverts commit 4b7637345b0dd533eefb8ab877887b2db7e26cb7.
Reason for revert: Fixed on main, now need to CP to f1.
Original change's description:
> Revert "[sdk] Ensure branch HEAD is fetched locally"
>
> This reverts commit 1ac2a811704bba7a2a2c99a976a09b8a4a4c9e2b.
>
> Reason for revert: Causing breakage at go/bbid/8853570097536582224
>
> Original change's description:
> > [sdk] Ensure branch HEAD is fetched locally
> >
> > This should fix flakes like go/bbid/8853799753680230336.
> >
> > Change-Id: Ic588429542e43b53fc2ba1d279f3b5312d0c2d1b
> > Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/495362
> > Reviewed-by: Gary Boone <gboone@google.com>
> > Commit-Queue: Anthony Fandrianto <atyfto@google.com>
>
> Change-Id: I77168b9cd3c664d28c57f74057e59ae998155bb5
> Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/496778
> Reviewed-by: Anthony Fandrianto <atyfto@google.com>
> Reviewed-by: Gary Boone <gboone@google.com>
> Commit-Queue: Anthony Fandrianto <atyfto@google.com>
Change-Id: I9a6df734ce501df2c572f7a1b33f3eb24baf2bbd
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/497059
Fuchsia-Auto-Submit: Anthony Fandrianto <atyfto@google.com>
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Reviewed-by: Nathan Mulcahey <nmulcahey@google.com>
(cherry picked from commit 5cd1545671537bc7bcfd0a33f4d987121e78e838)
Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/497198
diff --git a/recipes/sdk.expected/release_ci.json b/recipes/sdk.expected/release_ci.json
index 7bc7436..b31d2f9 100644
--- a/recipes/sdk.expected/release_ci.json
+++ b/recipes/sdk.expected/release_ci.json
@@ -274,6 +274,16 @@
{
"cmd": [
"git",
+ "fetch",
+ "origin",
+ "h3ll0"
+ ],
+ "cwd": "[START_DIR]/fuchsia/integration",
+ "name": "git fetch"
+ },
+ {
+ "cmd": [
+ "git",
"--no-pager",
"tag",
"--merged",
diff --git a/recipes/sdk.expected/release_ci_image_failure.json b/recipes/sdk.expected/release_ci_image_failure.json
index d13d386..97188ef 100644
--- a/recipes/sdk.expected/release_ci_image_failure.json
+++ b/recipes/sdk.expected/release_ci_image_failure.json
@@ -274,6 +274,16 @@
{
"cmd": [
"git",
+ "fetch",
+ "origin",
+ "h3ll0"
+ ],
+ "cwd": "[START_DIR]/fuchsia/integration",
+ "name": "git fetch"
+ },
+ {
+ "cmd": [
+ "git",
"--no-pager",
"tag",
"--merged",
diff --git a/recipes/sdk.expected/release_ci_new_upload.json b/recipes/sdk.expected/release_ci_new_upload.json
index fbad398..35b5595 100644
--- a/recipes/sdk.expected/release_ci_new_upload.json
+++ b/recipes/sdk.expected/release_ci_new_upload.json
@@ -274,6 +274,16 @@
{
"cmd": [
"git",
+ "fetch",
+ "origin",
+ "h3ll0"
+ ],
+ "cwd": "[START_DIR]/fuchsia/integration",
+ "name": "git fetch"
+ },
+ {
+ "cmd": [
+ "git",
"--no-pager",
"tag",
"--merged",
diff --git a/recipes/sdk.expected/release_ci_no_update_ref.json b/recipes/sdk.expected/release_ci_no_update_ref.json
index 11474f9..191949d 100644
--- a/recipes/sdk.expected/release_ci_no_update_ref.json
+++ b/recipes/sdk.expected/release_ci_no_update_ref.json
@@ -274,6 +274,16 @@
{
"cmd": [
"git",
+ "fetch",
+ "origin",
+ "h3ll0"
+ ],
+ "cwd": "[START_DIR]/fuchsia/integration",
+ "name": "git fetch"
+ },
+ {
+ "cmd": [
+ "git",
"--no-pager",
"tag",
"--merged",
diff --git a/recipes/sdk.py b/recipes/sdk.py
index 0da4db9..56a8a29 100644
--- a/recipes/sdk.py
+++ b/recipes/sdk.py
@@ -176,6 +176,8 @@
branch_head = api.git.get_remote_branch_head(
api.sso.sso_to_https(remote), settings.branch
)
+ with api.context(cwd=integration_repo):
+ api.git.fetch("origin", refspec=branch_head)
if release_version in api.release.get_release_versions(
ref=branch_head, repo_path=integration_repo
):
