diff --git a/src/main/java/org/opendatamesh/platform/up/executor/gitlabci/mappers/GitlabPipelineMapper.java b/src/main/java/org/opendatamesh/platform/up/executor/gitlabci/mappers/GitlabPipelineMapper.java index be7ab69..ce926ed 100644 --- a/src/main/java/org/opendatamesh/platform/up/executor/gitlabci/mappers/GitlabPipelineMapper.java +++ b/src/main/java/org/opendatamesh/platform/up/executor/gitlabci/mappers/GitlabPipelineMapper.java @@ -22,13 +22,14 @@ public interface GitlabPipelineMapper { */ @Mapping(source = "configuration.params", target = "variables") @Mapping(source = "template.branch", target = "ref") - default GitlabPipelineResource toGitlabPipelineResource(ConfigurationResource configuration, TemplateResource template, String callbackRef) { + default GitlabPipelineResource toGitlabPipelineResource(ConfigurationResource configuration, TemplateResource template, String callbackRef, Long taskId) { GitlabPipelineResource gitlabPipelineResource = new GitlabPipelineResource(); gitlabPipelineResource.setRef(template.getBranch()); List> variables = new ArrayList<>(); for (Map.Entry entry : configuration.getParams().entrySet()) { variables.add(Map.of("key", entry.getKey(), "value", entry.getValue())); } + variables.add(Map.of("key", "taskId", "value", taskId.toString())); gitlabPipelineResource.setVariables(variables); return gitlabPipelineResource; } diff --git a/src/main/java/org/opendatamesh/platform/up/executor/gitlabci/services/GitlabPipelineService.java b/src/main/java/org/opendatamesh/platform/up/executor/gitlabci/services/GitlabPipelineService.java index ca60a6b..de335da 100644 --- a/src/main/java/org/opendatamesh/platform/up/executor/gitlabci/services/GitlabPipelineService.java +++ b/src/main/java/org/opendatamesh/platform/up/executor/gitlabci/services/GitlabPipelineService.java @@ -61,7 +61,7 @@ public GitlabRunResourceResponse runPipeline(ConfigurationResource configuration Long taskId, String gitlabInstanceUrl) throws UnprocessableEntityException { GitlabPipelineResource pipelineResource = pipelineMapper.toGitlabPipelineResource( - configurationResource, templateResource, callbackRef + configurationResource, templateResource, callbackRef, taskId ); if (templateResource.getBranch() == null || templateResource.getProjectId() == null) {