Merge pull request #107 from screwdriver-cd/email

feat: Add settings to job config
screwdriver-cd · Feb 24, 2017 · abfb345 · abfb345
2 parents 505964a + c7677b4
commit abfb345
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/config/job.js b/config/job.js
@@ -60,13 +60,15 @@ const SCHEMA_STEP_OBJECT = Joi.object()
 const SCHEMA_STEP = Joi.alternatives().try(SCHEMA_STEP_STRING, SCHEMA_STEP_OBJECT);
 const SCHEMA_STEPS = Joi.array().items(SCHEMA_STEP).min(1);
 const SCHEMA_IMAGE = Joi.string();
+const SCHEMA_SETTINGS = Joi.object().optional();
 const SCHEMA_JOB = Joi.object()
     .keys({
         steps: SCHEMA_STEPS,
         environment: SCHEMA_ENVIRONMENT,
         matrix: SCHEMA_MATRIX,
         image: SCHEMA_IMAGE,
-        secrets: SCHEMA_SECRETS
+        secrets: SCHEMA_SECRETS,
+        settings: SCHEMA_SETTINGS
     })
     .default({});
 
@@ -82,5 +84,6 @@ module.exports = {
     step: SCHEMA_STEP,
     environment: SCHEMA_ENVIRONMENT,
     image: SCHEMA_IMAGE,
-    job: SCHEMA_JOB
+    job: SCHEMA_JOB,
+    settings: SCHEMA_SETTINGS
 };
diff --git a/test/config/job.test.js b/test/config/job.test.js
@@ -40,4 +40,10 @@ describe('config job', () => {
             assert.isNull(validate('config.job.image.yaml', config.job.image).error);
         });
     });
+
+    describe('settings', () => {
+        it('validates settings', () => {
+            assert.isNull(validate('config.job.settings.yaml', config.job.settings).error);
+        });
+    });
 });
diff --git a/test/data/config.job.settings.yaml b/test/data/config.job.settings.yaml
@@ -0,0 +1 @@
+foo: bar