From a29cbff1ffaf18ca4ae33e7140abab066dcb0dc4 Mon Sep 17 00:00:00 2001
From: Terry Kong <terryk@nvidia.com>
Date: Mon, 2 Oct 2023 12:50:02 -0700
Subject: [PATCH] Fixes rosetta/tests/extra-only-distribution.sh test failure
 (#276)

Test failed due to cherry-picking from a future commit, which may
fail since the distribution was built on a pinned past commit.

The issue was even though the commit to cherry-pick only contained
a file deletion, because there were edits to the file between the
DISTRIBUTION_BASE_REF and TOT main, git cherry-pick errors out
because the file deleted was not the same as the one the patch was based
on

## Additionally
This PR will also allow nightly-distribution-test.yaml to be dispatched
thru the UI
---
 .github/workflows/nightly-distribution-test.yaml | 1 +
 rosetta/tests/extra-only-distribution.sh         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/nightly-distribution-test.yaml b/.github/workflows/nightly-distribution-test.yaml
index 441bb39e9..16541e1cb 100644
--- a/.github/workflows/nightly-distribution-test.yaml
+++ b/.github/workflows/nightly-distribution-test.yaml
@@ -1,6 +1,7 @@
 name: Nightly Distribution test
 
 on:
+  workflow_dispatch:
   workflow_run:
     workflows: [Nightly JAX build]
     types: [completed]
diff --git a/rosetta/tests/extra-only-distribution.sh b/rosetta/tests/extra-only-distribution.sh
index b174b7811..5c21b64b3 100755
--- a/rosetta/tests/extra-only-distribution.sh
+++ b/rosetta/tests/extra-only-distribution.sh
@@ -17,6 +17,7 @@ DISTRIBUTION_BASE_REF=22117ce5a3606706ba9519ccdd77b532ad8ff7b2
 
 git clone $UPSTREAM_URL $repo_tmp
 git clone $UPSTREAM_URL $extra_tmp
+git -C $extra_tmp checkout $DISTRIBUTION_BASE_REF
 echo "patch/delete-readme" >> $patchlist_tmp
 
 cd $extra_tmp