internal/task: update private x patch workflow

To match our new checkpoint branch based workflow, this now matches the
same workflow we use when constructing the internal release branches
for minor releases.

Updates golang/go#65756

Change-Id: I4a58e1f66b909a51e498e924023d3a776a920ed7
Reviewed-on: https://go-review.googlesource.com/c/build/+/647375
Reviewed-by: Dmitri Shuralyov <[email protected]>
Auto-Submit: Roland Shoemaker <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>

Author: rolandshoemaker

internal/task/privx.go

@@ -46,7 +46,8 @@ func (x *PrivXPatch) NewDefinition(tagx *TagXReposTasks) *wf.Definition {
 
 	repos := wf.Task0(wd, "Load all repositories", tagx.SelectRepos)
 
-	repos = wf.Task4(wd, "Publish change", func(ctx *wf.TaskContext, clNumber string, reviewers []string, repos []TagRepo, repoName string) ([]TagRepo, error) {
+	// check change is ready
+	checkedChange := wf.Task3(wd, "Check change", func(ctx *wf.TaskContext, clNumber string, repoName string, repos []TagRepo) (*gerrit.ChangeInfo, error) {
 		if !slices.ContainsFunc(repos, func(r TagRepo) bool { return r.Name == repoName }) {
 			return nil, fmt.Errorf("no repository %q", repoName)
 		}
@@ -58,6 +59,82 @@ func (x *PrivXPatch) NewDefinition(tagx *TagXReposTasks) *wf.Definition {
 		if changeInfo.Project != repoName {
 			return nil, fmt.Errorf("CL is for unexpected project, got: %s, want %s", changeInfo.Project, repoName)
 		}
+
+		if !changeInfo.Submittable {
+			return nil, fmt.Errorf("Change %s is not submittable", internalGerritChangeURL(clNumber))
+		}
+		ra, err := x.PrivateGerrit.GetRevisionActions(ctx.Context, clNumber, "current")
+		if err != nil {
+			return nil, err
+		}
+		if ra["submit"] == nil || !ra["submit"].Enabled {
+			return nil, fmt.Errorf("Change %s is not submittable", internalGerritChangeURL(clNumber))
+		}
+
+		return changeInfo, nil
+	}, clNumber, repoName, repos)
+
+	// create checkpoint branch
+	checkpointBranch := wf.Task1(wd, "Create checkpoint branch", func(ctx *wf.TaskContext, repoName string) (string, error) {
+		publicHead, err := x.PrivateGerrit.ReadBranchHead(ctx.Context, repoName, "public")
+		if err != nil {
+			return "", err
+		}
+		checkpointName := fmt.Sprintf("public-%s", time.Now().UTC().Format("2006-01-02-1504"))
+		if _, err := x.PrivateGerrit.CreateBranch(ctx.Context, "go", checkpointName, gerrit.BranchInput{Revision: publicHead}); err != nil {
+			return "", err
+		}
+		return checkpointName, nil
+	}, repoName, wf.After(checkedChange))
+
+	// move and rebase change onto checkpoint branch
+	movedChange := wf.Task2(wd, "Move change+rebase onto checkpoint branch", func(ctx *wf.TaskContext, change *gerrit.ChangeInfo, checkpointBranch string) (*gerrit.ChangeInfo, error) {
+		newCI, err := x.PrivateGerrit.MoveChange(ctx.Context, change.ChangeID, checkpointBranch, true)
+		if err != nil {
+			return nil, err
+		}
+		newCI, err = x.PrivateGerrit.RebaseChange(ctx.Context, change.ChangeID, "")
+		if err != nil {
+			return nil, err
+		}
+		return &newCI, nil
+	}, checkedChange, checkpointBranch)
+
+	// wait for change to be submitted
+	submittedChange := wf.Task1(wd, "Await submission", func(ctx *wf.TaskContext, change *gerrit.ChangeInfo) (*gerrit.ChangeInfo, error) {
+		var submitted gerrit.ChangeInfo
+		if _, err := AwaitCondition(ctx, time.Second*10, func() (string, bool, error) {
+			// The ChangeInfo object returned by RebaseChange doesn't contain
+			// information about submittability, so we need to refetch it using
+			// GetChange.
+			ci, err := x.PrivateGerrit.GetChange(ctx, change.ChangeID, gerrit.QueryChangesOpt{Fields: []string{"SUBMITTABLE"}})
+			if err != nil {
+				return "", false, err
+			}
+
+			if !ci.Submittable {
+				return "", false, nil
+			}
+
+			submitted, err = x.PrivateGerrit.SubmitChange(ctx, ci.ChangeID)
+			if err != nil {
+				return "", false, err
+			}
+			return "", true, nil
+
+		}); err != nil {
+			return nil, err
+		}
+
+		return &submitted, nil
+	}, movedChange)
+
+	// publish change publicly
+	publicChange := wf.Task3(wd, "Publish change", func(ctx *wf.TaskContext, change *gerrit.ChangeInfo, reviewers []string, repoName string) (*gerrit.ChangeInfo, error) {
+		changeInfo, err := x.PrivateGerrit.GetChange(ctx, change.ChangeID, gerrit.QueryChangesOpt{Fields: []string{"CURRENT_REVISION"}})
+		if err != nil {
+			return nil, err
+		}
 		if changeInfo.Status != gerrit.ChangeStatusMerged {
 			return nil, fmt.Errorf("CL %s not merged, status is %s", clNumber, changeInfo.Status)
 		}
@@ -136,13 +213,16 @@ func (x *PrivXPatch) NewDefinition(tagx *TagXReposTasks) *wf.Definition {
 		if err != nil {
 			return nil, err
 		}
-		return repos, nil
-	}, clNumber, reviewers, repos, repoName)
+		return change, nil
+	}, submittedChange, reviewers, repoName)
 
-	tagged := wf.Expand4(wd, "Create single-repo plan", tagx.BuildSingleRepoPlan, repos, repoName, skipPostSubmit, reviewers)
+	// tag repository
+	tagged := wf.Expand4(wd, "Create single-repo plan", tagx.BuildSingleRepoPlan, repos, repoName, skipPostSubmit, reviewers, wf.After(publicChange))
 
+	// wait for manual approval of the announcement message
 	okayToAnnoucne := wf.Action0(wd, "Wait to Announce", x.ApproveAction, wf.After(tagged))
 
+	// send announcement email
 	wf.Task5(wd, "Mail announcement", func(ctx *wf.TaskContext, tagged TagRepo, cve string, githubIssue string, relNote string, acknowledgement string) (string, error) {
 		var buf bytes.Buffer
 		if err := privXPatchAnnouncementTmpl.Execute(&buf, map[string]string{

internal/task/privx_test.go

@@ -47,11 +47,34 @@ func (c *privxClient) Tag(ctx context.Context, repo string, tag string, commit s
 	return nil
 }
 
+func (c *privxClient) GetRevisionActions(ctx context.Context, changeID, revision string) (map[string]*gerrit.ActionInfo, error) {
+	return map[string]*gerrit.ActionInfo{
+		"submit": &gerrit.ActionInfo{Enabled: true},
+	}, nil
+}
+
+func (c *privxClient) CreateBranch(ctx context.Context, project, branch string, input gerrit.BranchInput) (string, error) {
+	return "", nil
+}
+
+func (c *privxClient) MoveChange(ctx context.Context, changeID string, branch string, keepAllVotes bool) (gerrit.ChangeInfo, error) {
+	return gerrit.ChangeInfo{}, nil
+}
+
+func (c *privxClient) RebaseChange(ctx context.Context, changeID string, revision string) (gerrit.ChangeInfo, error) {
+	return gerrit.ChangeInfo{}, nil
+}
+
+func (c *privxClient) SubmitChange(ctx context.Context, changeID string) (gerrit.ChangeInfo, error) {
+	return gerrit.ChangeInfo{}, nil
+}
+
 func (c *privxClient) GetChange(ctx context.Context, changeID string, opts ...gerrit.QueryChangesOpt) (*gerrit.ChangeInfo, error) {
 	return &gerrit.ChangeInfo{
 		Project:         "net",
 		Status:          gerrit.ChangeStatusMerged,
 		CurrentRevision: "dead",
+		Submittable:     true,
 		Revisions: map[string]gerrit.RevisionInfo{
 			"dead": {
 				Fetch: map[string]*gerrit.FetchInfo{