grim/convey

Make the bitbucket loader set the default plan to the branch we're on

2019-07-29, Gary Kramlich
201d62c05f7e
Parents e1bfe821ac35
Children 03b697604478
Make the bitbucket loader set the default plan to the branch we're on
1 files changed, 17 insertions(+), 3 deletions(-)
  • +17 -3
    loaders/bitbucket/loader.go
    • --- a/loaders/bitbucket/loader.go Mon Jul 29 02:48:32 2019 -0500
    +++ b/loaders/bitbucket/loader.go Mon Jul 29 02:49:01 2019 -0500
    @@ -21,6 +21,10 @@
    "os"
    "path/filepath"
    + "bitbucket.org/rw_grim/govcs"
    + "github.com/go-yaml/yaml"
    + log "github.com/sirupsen/logrus"
    +
    "bitbucket.org/rw_grim/convey/config"
    "bitbucket.org/rw_grim/convey/docker"
    "bitbucket.org/rw_grim/convey/plans"
    @@ -28,8 +32,6 @@
    "bitbucket.org/rw_grim/convey/script"
    "bitbucket.org/rw_grim/convey/stages"
    "bitbucket.org/rw_grim/convey/tasks"
    -
    - "github.com/go-yaml/yaml"
    )
    const (
    @@ -208,7 +210,19 @@
    // DefaultPlan returns the default plan name.
    func (l *Loader) DefaultPlan() string {
    - return defaultPlan
    + vcs, err := govcs.Detect(".")
    + if err != nil {
    + log.Error(err)
    + return defaultPlan
    + }
    +
    + branch := vcs.Branch()
    +
    + if branch == "master" || branch == "default" {
    + return defaultPlan
    + }
    +
    + return "branch-" + branch
    }
    // ResolvePlanName resolves the plan name if the one in the config contains a