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

fix: copy container image #5876

Merged
merged 1 commit into from
Sep 20, 2024
Merged

fix: copy container image #5876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions pkg/eventProcessor/in/WorkflowEventProcessorService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ func (impl *WorkflowEventProcessorImpl) SubscribeCDStageCompleteEvent() error {
pluginArtifacts := make(map[string][]string)
if cdStageCompleteEvent.PluginArtifacts != nil {
pluginArtifacts = cdStageCompleteEvent.PluginArtifacts.GetRegistryToUniqueContainerArtifactDataMapping()
globalUtil.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)
}
globalUtil.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)

impl.logger.Debugw("received post stage success event for workflow runner ", "wfId", strconv.Itoa(wfr.Id))
err = impl.workflowDagExecutor.HandlePostStageSuccessEvent(triggerContext, wfr, wfr.CdWorkflowId, cdStageCompleteEvent.CdPipelineId, cdStageCompleteEvent.TriggeredBy, pluginArtifacts)
Expand Down Expand Up @@ -646,8 +646,8 @@ func (impl *WorkflowEventProcessorImpl) BuildCiArtifactRequest(event bean.CiComp
pluginArtifacts := make(map[string][]string)
if event.PluginArtifacts != nil {
pluginArtifacts = event.PluginArtifacts.GetRegistryToUniqueContainerArtifactDataMapping()
globalUtil.MergeMaps(pluginArtifacts, event.PluginRegistryArtifactDetails)
}
globalUtil.MergeMaps(pluginArtifacts, event.PluginRegistryArtifactDetails)

request := &wrokflowDagBean.CiArtifactWebhookRequest{
Image: event.DockerImage,
Expand Down
3 changes: 1 addition & 2 deletions pkg/pipeline/pipelineStageVariableParser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ type RefPluginName = string

const (
COPY_CONTAINER_IMAGE RefPluginName = "Copy container image"
COPY_CONTAINER_IMAGE_VERSION_V1 = "v1.0.0"
COPY_CONTAINER_IMAGE_VERSION_V2 = "v1.1.0"
COPY_CONTAINER_IMAGE_VERSION_V1 = "1.0.0"
EMPTY_STRING = " "
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/workflow/dag/WorkflowDagExecutor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,8 @@ func (impl *WorkflowDagExecutorImpl) HandlePreStageSuccessEvent(triggerContext t
pluginArtifacts := make(map[string][]string)
if cdStageCompleteEvent.PluginArtifacts != nil {
pluginArtifacts = cdStageCompleteEvent.PluginArtifacts.GetRegistryToUniqueContainerArtifactDataMapping()
util4.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)
}
util4.MergeMaps(pluginArtifacts, cdStageCompleteEvent.PluginRegistryArtifactDetails)

err = impl.deactivateUnusedPaths(wfRunner.ImagePathReservationIds, pluginArtifacts)
if err != nil {
Expand Down
Loading