cherrypickapproved: Add option to approve PRs without lgtm or approved labels

pkg/plugins/cherrypickapproved/cherrypickapproved.go

@@ -128,8 +128,10 @@ func (h *handler) handle(log *logrus.Entry, gc plugins.PluginGitHubClient, e git
 	}()
 
 	var (
-		approvers []string
-		branchRe  *regexp.Regexp
+		approvers                 []string
+		branchRe                  *regexp.Regexp
+		allowMissingApprovedLabel bool
+		allowMissingLGTMLabel     bool
 	)
 
 	// Filter configurations
@@ -139,6 +141,8 @@ func (h *handler) handle(log *logrus.Entry, gc plugins.PluginGitHubClient, e git
 			foundRepoOrg = true
 			approvers = cfg.Approvers
 			branchRe = cfg.BranchRe
+			allowMissingApprovedLabel = cfg.AllowMissingApprovedLabel
+			allowMissingLGTMLabel = cfg.AllowMissingLGTMLabel
 		}
 	}
 
@@ -219,7 +223,7 @@ func (h *handler) handle(log *logrus.Entry, gc plugins.PluginGitHubClient, e git
 		return nil
 	}
 
-	if hasLGTMLabel && hasApprovedLabel && !hasInvalidLabels {
+	if (hasLGTMLabel || allowMissingLGTMLabel) && (hasApprovedLabel || allowMissingApprovedLabel) && !hasInvalidLabels {
 		if !hasCherryPickApprovedLabel {
 			if err := h.AddLabel(gc, org, repo, prNumber, labels.CpApproved); err != nil {
 				log.WithError(err).Errorf("failed to add the label: %s", labels.CpApproved)

pkg/plugins/cherrypickapproved/cherrypickapproved_test.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
+
 	"sigs.k8s.io/prow/pkg/github"
 	"sigs.k8s.io/prow/pkg/labels"
 	"sigs.k8s.io/prow/pkg/plugins"
@@ -109,6 +110,33 @@ func TestHandle(t *testing.T) {
 				assert.EqualValues(t, 1, mock.RemoveLabelCallCount())
 			},
 		},
+		{
+			name: "success apply cherry-pick-approved label on PR without lgtm+approved",
+			config: []plugins.CherryPickApproved{
+				{
+					Org:                       testOrgRepo,
+					Repo:                      testOrgRepo,
+					BranchRe:                  regexp.MustCompile("^release-*"),
+					Approvers:                 []string{"user"},
+					AllowMissingApprovedLabel: true,
+					AllowMissingLGTMLabel:     true,
+				},
+			},
+			prepare: func(mock *cherrypickapprovedfakes.FakeImpl) {
+				mock.GetCombinedStatusReturns(&github.CombinedStatus{}, nil)
+				mock.GetIssueLabelsReturns(
+					[]github.Label{
+						{Name: labels.CpUnapproved},
+					},
+					nil,
+				)
+			},
+			assert: func(mock *cherrypickapprovedfakes.FakeImpl, err error) {
+				assert.NoError(t, err)
+				assert.EqualValues(t, 1, mock.AddLabelCallCount())
+				assert.EqualValues(t, 1, mock.RemoveLabelCallCount())
+			},
+		},
 		{
 			name: "skip non approver",
 			config: []plugins.CherryPickApproved{{

pkg/plugins/config.go

@@ -726,6 +726,10 @@ type CherryPickApproved struct {
 	BranchRe     *regexp.Regexp `json:"-"`
 	// Approvers is the list of GitHub logins allowed to approve a cherry-pick.
 	Approvers []string `json:"approvers,omitempty"`
+	// AllowMissingApprovedLabel allows approving cherry-pick without the approved label.
+	AllowMissingApprovedLabel bool `json:"allow_missing_approved_label,omitempty"`
+	// AllowMissingLGTMLabel allows approving cherry-pick without the lgtm label.
+	AllowMissingLGTMLabel bool `json:"allow_missing_lgtm_label,omitempty"`
 }
 
 // CherryPickUnapproved is the config for the cherrypick-unapproved plugin.