Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: pre-postcd trigger with plugin #4176

Merged
merged 11 commits into from
Oct 31, 2023
Merged

feat: pre-postcd trigger with plugin #4176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
313795a
omit return error in modifications not found
Shivam-nagar23 Oct 30, 2023
59a32c2
time
Shivam-nagar23 Oct 30, 2023
847beed
comments
Shivam-nagar23 Oct 30, 2023
71c5ce8
Merge branch 'main' into fix-precd-trigger
Shivam-nagar23 Oct 30, 2023
b799f88
pipeline type
Shivam-nagar23 Oct 30, 2023
d889477
pipeline type
Shivam-nagar23 Oct 30, 2023
355a0e5
check
Shivam-nagar23 Oct 30, 2023
ab4e20e
pipeline-type
Shivam-nagar23 Oct 30, 2023
03a62d7
pipeline-type refactor
Shivam-nagar23 Oct 30, 2023
c2727a2
merge main
Shivam-nagar23 Oct 31, 2023
d754100
Merge branch 'main' into fix-precd-trigger
Shivam-nagar23 Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/pipeline/WorkflowDagExecutor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions pkg/pipeline/types/Workflow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading