feat(2822): Extend normal job fields to pr job (#601)

screwdriver-cd · Feb 2, 2024 · a41de0d · a41de0d
1 parent c042c83
commit a41de0d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/lib/pipeline.js b/lib/pipeline.js
@@ -658,11 +658,11 @@ class PipelineModel extends BaseModel {
             j => !j.name.startsWith(`PR-${prNum}:`) && jobsToCreate.includes(j.name)
         );
 
-        // create a map for PR Parent Jobs like: {main: 1, publish: 2}
+        // create a map for PR Parent Jobs like: {main: {id: 1}, publish: {id: 2}}
         const prParentJobIdMap = {};
 
         prFromPipelineJobs.forEach(j => {
-            prParentJobIdMap[j.name] = j.id;
+            prParentJobIdMap[j.name] = j;
         });
 
         // Create missing PR jobs
@@ -677,7 +677,9 @@ class PipelineModel extends BaseModel {
 
                     // If there is a pr parent
                     if (prParentJobIdMap[jobName]) {
-                        jobModel.prParentJobId = prParentJobIdMap[jobName];
+                        jobModel.prParentJobId = prParentJobIdMap[jobName].id;
+                        jobModel.templateId = prParentJobIdMap[jobName].templateId;
+                        jobModel.description = prParentJobIdMap[jobName].description;
                     }
 
                     // Create jobs

diff --git a/test/lib/pipeline.test.js b/test/lib/pipeline.test.js
@@ -182,6 +182,8 @@ describe('Pipeline Model', () => {
         testJob = getJobMocks({
             id: 100,
             name: 'test',
+            description: 'test job',
+            templateId: 5,
             archived: false
         });
 
@@ -1600,7 +1602,9 @@ describe('Pipeline Model', () => {
                         }
                     ],
                     pipelineId: testId,
-                    prParentJobId: 100
+                    prParentJobId: 100,
+                    templateId: 5,
+                    description: 'test job'
                 });
                 assert.calledWith(
                     jobFactoryMock.create.secondCall,
@@ -1714,7 +1718,9 @@ describe('Pipeline Model', () => {
                         }
                     ],
                     pipelineId: testId,
-                    prParentJobId: 100
+                    prParentJobId: 100,
+                    templateId: 5,
+                    description: 'test job'
                 });
                 assert.calledWith(
                     jobFactoryMock.create.secondCall,
@@ -1951,7 +1957,9 @@ describe('Pipeline Model', () => {
                     permutations: PARSED_YAML.jobs.main,
                     pipelineId: testId,
                     name: 'PR-2:main',
-                    prParentJobId: 99998
+                    prParentJobId: 99998,
+                    templateId: undefined,
+                    description: undefined
                 });
             });
         });