Merge pull request openshift#1289 from petr-muller/main-branch-fix

promotion: support `main` branch
alvaroaleman · Oct 9, 2020 · 439c320 · 439c320
2 parents bd69a8a + fdbe8e9
commit 439c320
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/pkg/promotion/promotion.go b/pkg/promotion/promotion.go
@@ -5,10 +5,11 @@ import (
 	"flag"
 	"fmt"
 
-	cioperatorapi "github.com/openshift/ci-tools/pkg/api"
-	"github.com/openshift/ci-tools/pkg/config"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/test-infra/prow/flagutil"
+
+	cioperatorapi "github.com/openshift/ci-tools/pkg/api"
+	"github.com/openshift/ci-tools/pkg/config"
 )
 
 const (
@@ -99,13 +100,14 @@ func IsBumpable(branch, currentRelease string) bool {
 // DetermineReleaseBranch determines the branch that will be used to the future release,
 // based on the branch that is currently promoting to the current release.
 func DetermineReleaseBranch(currentRelease, futureRelease, currentBranch string) (string, error) {
-	if currentBranch == "master" {
+	switch currentBranch {
+	case "master", "main":
 		return fmt.Sprintf("release-%s", futureRelease), nil
-	} else if currentBranch == fmt.Sprintf("openshift-%s", currentRelease) {
+	case fmt.Sprintf("openshift-%s", currentRelease):
 		return fmt.Sprintf("openshift-%s", futureRelease), nil
-	} else if currentBranch == fmt.Sprintf("release-%s", currentRelease) {
+	case fmt.Sprintf("release-%s", currentRelease):
 		return fmt.Sprintf("release-%s", futureRelease), nil
-	} else {
+	default:
 		return "", fmt.Errorf("invalid branch %q promoting to current release", currentBranch)
 	}
 }

diff --git a/pkg/promotion/promotion_test.go b/pkg/promotion/promotion_test.go
@@ -8,9 +8,10 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"k8s.io/apimachinery/pkg/util/sets"
 
+	"k8s.io/test-infra/prow/flagutil"
+
 	cioperatorapi "github.com/openshift/ci-tools/pkg/api"
 	"github.com/openshift/ci-tools/pkg/config"
-	"k8s.io/test-infra/prow/flagutil"
 )
 
 func TestPromotesOfficialImages(t *testing.T) {
@@ -183,6 +184,14 @@ func TestDetermineReleaseBranches(t *testing.T) {
 			expectedFutureBranch: "release-4.1",
 			expectedError:        false,
 		},
+		{
+			name:                 "promotion from main makes a release branch",
+			currentRelease:       "4.0",
+			futureRelease:        "4.1",
+			currentBranch:        "main",
+			expectedFutureBranch: "release-4.1",
+			expectedError:        false,
+		},
 		{
 			name:                 "promotion from openshift release branch makes a new release branch",
 			currentRelease:       "4.0",