From 761949ac6b00ff08b58345fc262743d0a8f0c26d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Ma=C5=82achowski?= Date: Tue, 1 Oct 2024 08:15:01 +0200 Subject: [PATCH 1/2] Set jobtype for schedule event --- cmd/image-builder/main.go | 11 ++++++++--- pkg/azuredevops/pipelines/templatesParams.go | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/cmd/image-builder/main.go b/cmd/image-builder/main.go index 8d9fd4b0fee5..413b790c1212 100644 --- a/cmd/image-builder/main.go +++ b/cmd/image-builder/main.go @@ -197,12 +197,17 @@ func prepareADOTemplateParameters(options options) (adopipelines.OCIImageBuilder templateParameters.SetRepoOwner(options.gitState.RepositoryOwner) - if options.gitState.JobType == "presubmit" { + switch options.gitState.JobType { + case "presubmit": templateParameters.SetPresubmitJobType() - } else if options.gitState.JobType == "postsubmit" { + case "postsubmit": templateParameters.SetPostsubmitJobType() - } else if options.gitState.JobType == "workflow_dispatch" { + case "workflow_dispatch": templateParameters.SetWorkflowDispatchJobType() + case "schedule": + templateParameters.SetScheduleJobType() + default: + return nil, fmt.Errorf("unknown JobType received, ensure image-builder runs on supported event") } if options.gitState.IsPullRequest() { diff --git a/pkg/azuredevops/pipelines/templatesParams.go b/pkg/azuredevops/pipelines/templatesParams.go index 2db16997e44c..96601af10f73 100644 --- a/pkg/azuredevops/pipelines/templatesParams.go +++ b/pkg/azuredevops/pipelines/templatesParams.go @@ -54,6 +54,11 @@ func (p OCIImageBuilderTemplateParams) SetWorkflowDispatchJobType() { p["JobType"] = "workflow_dispatch" } +// SetScheduleJobType sets required parameter JobType to schedule. +func (p OCIImageBuilderTemplateParams) SetScheduleJobType() { + p["JobType"] = "workflow_dispatch" +} + // SetPullNumber sets optional parameter PullNumber. func (p OCIImageBuilderTemplateParams) SetPullNumber(number string) { p["PullNumber"] = number From 067fe404d4308ec9bde5c7b65a7dcbe6044fe6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Ma=C5=82achowski?= <38684517+KacperMalachowski@users.noreply.github.com> Date: Tue, 1 Oct 2024 08:23:48 +0200 Subject: [PATCH 2/2] Update pkg/azuredevops/pipelines/templatesParams.go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wojciech Sołtys <74361703+Sawthis@users.noreply.github.com> --- pkg/azuredevops/pipelines/templatesParams.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/azuredevops/pipelines/templatesParams.go b/pkg/azuredevops/pipelines/templatesParams.go index 96601af10f73..adc94d5625f4 100644 --- a/pkg/azuredevops/pipelines/templatesParams.go +++ b/pkg/azuredevops/pipelines/templatesParams.go @@ -56,7 +56,7 @@ func (p OCIImageBuilderTemplateParams) SetWorkflowDispatchJobType() { // SetScheduleJobType sets required parameter JobType to schedule. func (p OCIImageBuilderTemplateParams) SetScheduleJobType() { - p["JobType"] = "workflow_dispatch" + p["JobType"] = "schedule" } // SetPullNumber sets optional parameter PullNumber.