tests: fix config e2e tests

Author: FabianKramm

cmd/build.go

@@ -23,6 +23,8 @@ type BuildCmd struct {
 	SkipDependency          []string
 	Dependency              []string
 
+	Pipeline string
+
 	ForceBuild          bool
 	BuildSequential     bool
 	MaxConcurrentBuilds int
@@ -54,6 +56,7 @@ Builds all defined images and pushes them
 	buildCmd.Flags().StringSliceVarP(&cmd.Tags, "tag", "t", []string{}, "Use the given tag for all built images")
 	buildCmd.Flags().StringSliceVar(&cmd.SkipDependency, "skip-dependency", []string{}, "Skips building the following dependencies")
 	buildCmd.Flags().StringSliceVar(&cmd.Dependency, "dependency", []string{}, "Builds only the specific named dependencies")
+	buildCmd.Flags().StringVar(&cmd.Pipeline, "pipeline", "", "The pipeline to execute")
 
 	buildCmd.Flags().BoolVar(&cmd.SkipPush, "skip-push", false, "Skips image pushing, useful for minikube deployment")
 	buildCmd.Flags().BoolVar(&cmd.SkipPushLocalKubernetes, "skip-push-local-kube", false, "Skips image pushing, if a local kubernetes environment is detected")
@@ -75,6 +78,10 @@ func (cmd *BuildCmd) Run(f factory.Factory) error {
 }
 
 func (cmd *BuildCmd) runCommand(ctx *devspacecontext.Context, f factory.Factory, configOptions *loader.ConfigOptions) error {
+	if cmd.Pipeline == "" {
+		cmd.Pipeline = "build"
+	}
+
 	return runPipeline(ctx, f, true, &PipelineOptions{
 		Options: pipelinetypes.Options{
 			BuildOptions: build.Options{
@@ -91,6 +98,6 @@ func (cmd *BuildCmd) runCommand(ctx *devspacecontext.Context, f factory.Factory,
 		},
 		ConfigOptions: configOptions,
 		Only:          cmd.Dependency,
-		Pipeline:      "build",
+		Pipeline:      cmd.Pipeline,
 	})
 }

cmd/deploy.go

@@ -101,7 +101,7 @@ devspace deploy --kube-context=deploy-context
 	deployCmd.Flags().BoolVarP(&cmd.ForceDeploy, "force-deploy", "d", false, "Forces to (re-)deploy every deployment")
 	deployCmd.Flags().BoolVar(&cmd.SkipDeploy, "skip-deploy", false, "Skips deploying and only builds images")
 	deployCmd.Flags().BoolVar(&cmd.Render, "render", false, "If true will render manifests and print them instead of actually deploying them")
-	deployCmd.Flags().StringVar(&cmd.Pipeline, "pipeline", "deploy", "The pipeline to execute")
+	deployCmd.Flags().StringVar(&cmd.Pipeline, "pipeline", "", "The pipeline to execute")
 
 	deployCmd.Flags().StringSliceVar(&cmd.SkipDependency, "skip-dependency", []string{}, "Skips deploying the following dependencies")
 	deployCmd.Flags().StringSliceVar(&cmd.Dependency, "dependency", []string{}, "Deploys only the specific named dependencies")
@@ -126,6 +126,10 @@ func (cmd *DeployCmd) Run(f factory.Factory) error {
 }
 
 func (cmd *DeployCmd) runCommand(ctx *devspacecontext.Context, f factory.Factory, configOptions *loader.ConfigOptions) error {
+	if cmd.Pipeline == "" {
+		cmd.Pipeline = "deploy"
+	}
+
 	return runPipeline(ctx, f, true, &PipelineOptions{
 		Options: types.Options{
 			BuildOptions: build.Options{
@@ -234,7 +238,13 @@ func runPipeline(ctx *devspacecontext.Context, f factory.Factory, forceLeader bo
 		}
 	}
 
-	// deploy dependencies
+	// print config
+	if ctx.Log.GetLevel() == logrus.DebugLevel {
+		out, _ := yaml.Marshal(ctx.Config.Config())
+		ctx.Log.Debugf("Use config:\n%s\n", string(out))
+	}
+
+	// resolve dependencies
 	dependencies, err := f.NewDependencyManager(ctx, options.ConfigOptions).ResolveAll(ctx, dependency.ResolveOptions{
 		SkipDependencies: options.DependencyOptions.Exclude,
 		Dependencies:     options.Only,

cmd/dev.go

@@ -122,7 +122,7 @@ Open terminal instead of logs:
 	devCmd.Flags().BoolVar(&cmd.UI, "ui", true, "Start the ui server")
 	devCmd.Flags().IntVar(&cmd.UIPort, "ui-port", 0, "The port to use when opening the ui server")
 	devCmd.Flags().BoolVar(&cmd.Open, "open", true, "Open defined URLs in the browser, if defined")
-	devCmd.Flags().StringVar(&cmd.Pipeline, "pipeline", "dev", "The pipeline to execute")
+	devCmd.Flags().StringVar(&cmd.Pipeline, "pipeline", "", "The pipeline to execute")
 
 	devCmd.Flags().BoolVarP(&cmd.Terminal, "terminal", "t", false, "Open a terminal instead of showing logs")
 	devCmd.Flags().StringVar(&cmd.WorkingDirectory, "workdir", "", "The working directory where to open the terminal or execute the command")
@@ -169,6 +169,10 @@ func (cmd *DevCmd) Run(f factory.Factory, args []string) error {
 }
 
 func (cmd *DevCmd) runCommand(ctx *devspacecontext.Context, f factory.Factory, configOptions *loader.ConfigOptions) error {
+	if cmd.Pipeline == "" {
+		cmd.Pipeline = "dev"
+	}
+
 	return runPipeline(ctx, f, true, &PipelineOptions{
 		Options: types.Options{
 			BuildOptions: build.Options{

cmd/purge.go

@@ -19,6 +19,7 @@ type PurgeCmd struct {
 	*flags.GlobalFlags
 
 	Deployments string
+	Pipeline    string
 	All         bool
 
 	SkipDependency []string
@@ -56,6 +57,7 @@ devspace purge -d my-deployment
 
 	purgeCmd.Flags().StringVarP(&cmd.Deployments, "deployments", "d", "", "The deployment to delete (You can specify multiple deployments comma-separated, e.g. devspace-default,devspace-database etc.)")
 	purgeCmd.Flags().BoolVarP(&cmd.All, "all", "a", true, "When enabled purges the dependencies as well")
+	purgeCmd.Flags().StringVar(&cmd.Pipeline, "pipeline", "", "The pipeline to execute")
 
 	purgeCmd.Flags().StringSliceVar(&cmd.SkipDependency, "skip-dependency", []string{}, "Skips the following dependencies from purging")
 	purgeCmd.Flags().StringSliceVar(&cmd.Dependency, "dependency", []string{}, "Purges only the specific named dependencies")
@@ -76,6 +78,10 @@ func (cmd *PurgeCmd) Run(f factory.Factory) error {
 }
 
 func (cmd *PurgeCmd) runCommand(ctx *devspacecontext.Context, f factory.Factory, configOptions *loader.ConfigOptions) error {
+	if cmd.Pipeline == "" {
+		cmd.Pipeline = "purge"
+	}
+
 	return runPipeline(ctx, f, false, &PipelineOptions{
 		Options: types.Options{
 			DependencyOptions: types.DependencyOptions{
@@ -84,6 +90,6 @@ func (cmd *PurgeCmd) runCommand(ctx *devspacecontext.Context, f factory.Factory,
 		},
 		ConfigOptions: configOptions,
 		Only:          cmd.Dependency,
-		Pipeline:      "purge",
+		Pipeline:      cmd.Pipeline,
 	})
 }