fix(3106): Allow user to customize job when using pipeline template (#…

…567)
screwdriver-cd · Jun 6, 2024 · af17ddb · af17ddb
1 parent 0530a47
commit af17ddb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/config/base.js b/config/base.js
@@ -63,20 +63,26 @@ const SCHEMA_SUBSCRIBE = Joi.object().keys({
     )
 });
 
+const ALLOWED_JOB_FIELDS_WITH_PIPELINE_TEMPLATE = Joi.object().keys({
+    image: Job.image,
+    environment: Job.environment,
+    settings: Job.settings,
+    requires: Job.requires
+});
+
 const SCHEMA_CONFIG_PRE_TEMPLATE_MERGE = Joi.object()
     .keys({
         template: Joi.string().regex(Regex.FULL_TEMPLATE_NAME_WITH_NAMESPACE),
         version: Joi.number().integer().min(1).max(50),
         annotations: Annotations.annotations,
-        jobs: SCHEMA_JOBS.when('template', { is: Joi.exist(), then: Joi.forbidden(), otherwise: Joi.required() }),
+        jobs: Joi.when('template', {
+            is: Joi.exist(),
+            then: Joi.object().pattern(Job.jobName, ALLOWED_JOB_FIELDS_WITH_PIPELINE_TEMPLATE).unknown(false),
+            otherwise: SCHEMA_JOBS.required()
+        }),
         shared: Joi.when('template', {
             is: Joi.exist(),
-            then: Joi.object().keys({
-                image: Job.image,
-                environment: Job.environment,
-                settings: Job.settings,
-                requires: Job.requires
-            }),
+            then: ALLOWED_JOB_FIELDS_WITH_PIPELINE_TEMPLATE,
             otherwise: SCHEMA_SHARED
         }),
         cache: SCHEMA_CACHE,

diff --git a/test/data/config.base.pipelineTemplate-customized.yaml b/test/data/config.base.pipelineTemplate-customized.yaml
@@ -6,3 +6,13 @@ shared:
     settings:
         email: foo@example.com
     requires: ~commit
+
+jobs:
+    main:
+        requires: [~commit]
+        image: node:20
+        settings:
+            email: [test@email.com, test3@email.com]
+        environment:
+            VAR3: "three"
+            VAR1: "empty"