fix(3105): Handle mergeSharedSteps annotation for pipeline template (#…

…158) (#161)
screwdriver-cd · May 30, 2024 · 46d8704 · 46d8704
1 parent 6f26967
commit 46d8704
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -306,6 +306,7 @@ async function parsePipelineTemplate({ yaml }) {
             sharedConfig: pipelineTemplateConfig.shared,
             jobConfig: pipelineTemplateConfig.jobs[j]
         });
+        delete mergedJobs[j].annotations['screwdriver.cd/mergeSharedSteps'];
     });
     delete pipelineTemplateConfig.shared;
     pipelineTemplateConfig.jobs = mergedJobs;

diff --git a/test/data/parse-pipeline-template-with-mergeSharedSteps-annotation.json b/test/data/parse-pipeline-template-with-mergeSharedSteps-annotation.json
@@ -14,9 +14,7 @@
     },
     "jobs": {
       "extra": {
-        "annotations": {
-          "screwdriver.cd/mergeSharedSteps": true
-        },
+        "annotations": {},
         "environment": {
           "FOO": "BAR"
         },
@@ -34,9 +32,7 @@
         ]
       },
       "main": {
-        "annotations": {
-          "screwdriver.cd/mergeSharedSteps": false
-        },
+        "annotations": {},
         "environment": {
           "FOO": "BAR"
         },