diff --git a/pkg/pipeline/WorkflowDagExecutor.go b/pkg/pipeline/WorkflowDagExecutor.go index 9f05f31ea73..af809da2f74 100644 --- a/pkg/pipeline/WorkflowDagExecutor.go +++ b/pkg/pipeline/WorkflowDagExecutor.go @@ -972,6 +972,9 @@ func (impl *WorkflowDagExecutorImpl) buildWFRequest(runner *pipelineConfig.CdWor return nil, err } ciProjectDetail.CommitTime = commitTime.Format(bean2.LayoutRFC3339) + } else if ciPipeline.PipelineType == bean3.CI_JOB { + // This has been done to resolve unmarshalling issue in ci-runner, in case of no commit time(eg- polling container images) + ciProjectDetail.CommitTime = time.Time{}.Format(bean2.LayoutRFC3339) } else { impl.logger.Debugw("devtronbug#1062", ciPipeline.Id, cdPipeline.Id) return nil, fmt.Errorf("modifications not found for %d", ciPipeline.Id) @@ -1218,6 +1221,7 @@ func (impl *WorkflowDagExecutorImpl) buildWFRequest(runner *pipelineConfig.CdWor cdStageWorkflowRequest.SecretKey = ciPipeline.CiTemplate.DockerRegistry.AWSSecretAccessKey cdStageWorkflowRequest.DockerRegistryType = string(ciPipeline.CiTemplate.DockerRegistry.RegistryType) cdStageWorkflowRequest.DockerRegistryURL = ciPipeline.CiTemplate.DockerRegistry.RegistryURL + cdStageWorkflowRequest.CiPipelineType = ciPipeline.PipelineType } else if cdPipeline.AppId > 0 { ciTemplate, err := impl.CiTemplateRepository.FindByAppId(cdPipeline.AppId) if err != nil { diff --git a/pkg/pipeline/types/Workflow.go b/pkg/pipeline/types/Workflow.go index 99b1bc76b09..78eab9d0c71 100644 --- a/pkg/pipeline/types/Workflow.go +++ b/pkg/pipeline/types/Workflow.go @@ -117,6 +117,7 @@ type WorkflowRequest struct { WorkflowExecutor pipelineConfig.WorkflowExecutorType `json:"workflowExecutor"` PrePostDeploySteps []*bean.StepObject `json:"prePostDeploySteps"` CiArtifactLastFetch time.Time `json:"ciArtifactLastFetch"` + CiPipelineType string `json:"ciPipelineType"` Type bean.WorkflowPipelineType Pipeline *pipelineConfig.Pipeline Env *repository.Environment