diff --git a/pkg/config/job/presubmit.go b/pkg/config/job/presubmit.go
index 9ef06ad93..63fd7751c 100644
--- a/pkg/config/job/presubmit.go
+++ b/pkg/config/job/presubmit.go
@@ -46,6 +46,8 @@ type Presubmit struct {
 	// (Default: `/test <job name>`)
 	RerunCommand string       `json:"rerun_command,omitempty"`
 	JenkinsSpec  *JenkinsSpec `json:"jenkins_spec,omitempty"`
+	// SkipDraftPRBuild controls if we want to build a PR in draft mode
+	SkipDraftPRBuild bool `default:"false" json:"skip_draft_pr_build,omitempty"`
 
 	// We'll set these when we load it.
 	// re *regexp.Regexp // from Trigger.
@@ -115,6 +117,10 @@ func (p Presubmit) ShouldRun(baseRef string, changes ChangedFilesProvider, force
 		return false, err
 	} else if determined {
 		return shouldRun, nil
+
+	// Skip pre-submit job if skip draft PR build flag is set to true
+	if p.SkipDraftPRBuild {
+		return false, nil
 	}
 
 	// TODO temporary disable RequireRun
diff --git a/pkg/triggerconfig/inrepo/default_parameters.go b/pkg/triggerconfig/inrepo/default_parameters.go
index c94173233..2adfcc214 100644
--- a/pkg/triggerconfig/inrepo/default_parameters.go
+++ b/pkg/triggerconfig/inrepo/default_parameters.go
@@ -132,7 +132,7 @@ func DefaultPipelineParameters(prs *v1beta1.PipelineRun) (*v1beta1.PipelineRun,
 
 	// lets avoid missing workspaces causing issues
 	if len(prs.Spec.Workspaces) > 0 {
-		for i, _ := range prs.Spec.Workspaces {
+		for i := range prs.Spec.Workspaces {
 			w := &prs.Spec.Workspaces[i]
 			if w.Validate(ctx) != nil {
 				// lets default a workspace