Merge pull request #1910 from bradrydzewski/master
add when.local=false to disable plugin steps locally
This commit is contained in:
commit
99eb89be1c
8 changed files with 31 additions and 49 deletions
|
@ -29,7 +29,6 @@ type Agent struct {
|
|||
Platform string
|
||||
Namespace string
|
||||
Extension []string
|
||||
Disable []string
|
||||
Escalate []string
|
||||
Netrc []string
|
||||
Local string
|
||||
|
@ -187,7 +186,7 @@ func (a *Agent) prep(w *model.Work) (*yaml.Config, error) {
|
|||
transform.PluginParams(conf)
|
||||
|
||||
if a.Local != "" {
|
||||
transform.PluginDisable(conf, a.Disable)
|
||||
transform.PluginDisable(conf, true)
|
||||
transform.ImageVolume(conf, []string{a.Local + ":" + conf.Workspace.Path})
|
||||
}
|
||||
|
||||
|
|
|
@ -33,11 +33,6 @@ var execCmd = cli.Command{
|
|||
Usage: "build from local directory",
|
||||
EnvVar: "DRONE_LOCAL",
|
||||
},
|
||||
cli.StringSliceFlag{
|
||||
Name: "plugin",
|
||||
Usage: "plugin steps to enable",
|
||||
EnvVar: "DRONE_PLUGIN_ENABLE",
|
||||
},
|
||||
cli.StringSliceFlag{
|
||||
Name: "secret",
|
||||
Usage: "build secrets in KEY=VALUE format",
|
||||
|
@ -70,12 +65,6 @@ var execCmd = cli.Command{
|
|||
Name: "pull",
|
||||
Usage: "always pull latest plugin images",
|
||||
},
|
||||
cli.StringFlag{
|
||||
EnvVar: "DRONE_PLUGIN_NAMESPACE",
|
||||
Name: "namespace",
|
||||
Value: "plugins",
|
||||
Usage: "default plugin image namespace",
|
||||
},
|
||||
cli.StringSliceFlag{
|
||||
EnvVar: "DRONE_PLUGIN_PRIVILEGED",
|
||||
Name: "privileged",
|
||||
|
@ -157,7 +146,7 @@ var execCmd = cli.Command{
|
|||
Usage: "repository is private",
|
||||
EnvVar: "DRONE_REPO_PRIVATE",
|
||||
},
|
||||
cli.BoolFlag{
|
||||
cli.BoolTFlag{
|
||||
Name: "repo.trusted",
|
||||
Usage: "repository is trusted",
|
||||
EnvVar: "DRONE_REPO_TRUSTED",
|
||||
|
@ -326,17 +315,15 @@ func exec(c *cli.Context) error {
|
|||
}
|
||||
|
||||
a := agent.Agent{
|
||||
Update: agent.NoopUpdateFunc,
|
||||
Logger: agent.TermLoggerFunc,
|
||||
Engine: engine,
|
||||
Timeout: c.Duration("timeout.inactivity"),
|
||||
Platform: "linux/amd64",
|
||||
Namespace: c.String("namespace"),
|
||||
Disable: c.StringSlice("plugin"),
|
||||
Escalate: c.StringSlice("privileged"),
|
||||
Netrc: []string{},
|
||||
Local: dir,
|
||||
Pull: c.Bool("pull"),
|
||||
Update: agent.NoopUpdateFunc,
|
||||
Logger: agent.TermLoggerFunc,
|
||||
Engine: engine,
|
||||
Timeout: c.Duration("timeout.inactivity"),
|
||||
Platform: "linux/amd64",
|
||||
Escalate: c.StringSlice("privileged"),
|
||||
Netrc: []string{},
|
||||
Local: dir,
|
||||
Pull: c.Bool("pull"),
|
||||
}
|
||||
|
||||
payload := &model.Work{
|
||||
|
@ -353,7 +340,7 @@ func exec(c *cli.Context) error {
|
|||
Avatar: c.String("repo.avatar"),
|
||||
Timeout: int64(c.Duration("timeout").Minutes()),
|
||||
IsPrivate: c.Bool("repo.private"),
|
||||
IsTrusted: c.Bool("repo.trusted"),
|
||||
IsTrusted: c.BoolT("repo.trusted"),
|
||||
Clone: c.String("remote.url"),
|
||||
},
|
||||
System: &model.System{
|
||||
|
|
|
@ -10,13 +10,13 @@ import (
|
|||
type Constraints struct {
|
||||
Repo Constraint
|
||||
Ref Constraint
|
||||
Refspec Constraint
|
||||
Platform Constraint
|
||||
Environment Constraint
|
||||
Event Constraint
|
||||
Branch Constraint
|
||||
Status Constraint
|
||||
Matrix ConstraintMap
|
||||
Local types.BoolTrue
|
||||
}
|
||||
|
||||
// Match returns true if all constraints match the given input. If a single constraint
|
||||
|
|
|
@ -1,29 +1,20 @@
|
|||
package transform
|
||||
|
||||
import (
|
||||
"path/filepath"
|
||||
|
||||
"github.com/drone/drone/yaml"
|
||||
)
|
||||
import "github.com/drone/drone/yaml"
|
||||
|
||||
// PluginDisable is a transform function that alters the Yaml configuration to
|
||||
// disables plugins. This is intended for use when executing the pipeline
|
||||
// locally on your own computer.
|
||||
func PluginDisable(conf *yaml.Config, patterns []string) error {
|
||||
func PluginDisable(conf *yaml.Config, local bool) error {
|
||||
for _, container := range conf.Pipeline {
|
||||
if len(container.Commands) != 0 { // skip build steps
|
||||
continue
|
||||
}
|
||||
var match bool
|
||||
for _, pattern := range patterns {
|
||||
if ok, _ := filepath.Match(pattern, container.Name); ok {
|
||||
match = true
|
||||
break
|
||||
}
|
||||
}
|
||||
if !match {
|
||||
if local && !container.Constraints.Local.Bool() {
|
||||
container.Disabled = true
|
||||
}
|
||||
|
||||
if isClone(container) {
|
||||
container.Disabled = true
|
||||
continue
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
|
@ -5,6 +5,10 @@ import (
|
|||
"github.com/drone/drone/yaml"
|
||||
)
|
||||
|
||||
//
|
||||
// TODO remove
|
||||
//
|
||||
|
||||
func ImageSecrets(c *yaml.Config, secrets []*model.Secret, event string) error {
|
||||
var images []*yaml.Container
|
||||
images = append(images, c.Pipeline...)
|
||||
|
|
|
@ -2,6 +2,7 @@ package transform
|
|||
|
||||
import "github.com/drone/drone/yaml"
|
||||
|
||||
// ImageVolume mounts a default volume (used for drone exec)
|
||||
func ImageVolume(conf *yaml.Config, volumes []string) error {
|
||||
|
||||
if len(volumes) == 0 {
|
||||
|
|
|
@ -15,14 +15,14 @@ func (b *BoolTrue) UnmarshalYAML(unmarshal func(interface{}) error) error {
|
|||
return err
|
||||
}
|
||||
|
||||
b.value, err = strconv.ParseBool(s)
|
||||
if err != nil {
|
||||
b.value = true
|
||||
value, err := strconv.ParseBool(s)
|
||||
if err == nil {
|
||||
b.value = !value
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Bool returns the bool value.
|
||||
func (b BoolTrue) Bool() bool {
|
||||
return b.value
|
||||
return !b.value
|
||||
}
|
||||
|
|
|
@ -40,7 +40,7 @@ func TestBoolTrue(t *testing.T) {
|
|||
if err != nil {
|
||||
g.Fail(err)
|
||||
}
|
||||
g.Assert(out.Bool()).Equal(false)
|
||||
g.Assert(out.Bool()).Equal(true)
|
||||
})
|
||||
|
||||
g.It("should throw error when invalid", func() {
|
||||
|
|
Loading…
Reference in a new issue