screwdriver-data-schema 23.1.0 → 23.2.0

package/config/base.js

@@ -67,7 +67,7 @@ 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.when('template', { is: Joi.exist(), then: Joi.forbidden() }),
+        annotations: Annotations.annotations,
         jobs: SCHEMA_JOBS.when('template', { is: Joi.exist(), then: Joi.forbidden(), otherwise: Joi.required() }),
         shared: Joi.when('template', {
             is: Joi.exist(),
@@ -78,11 +78,11 @@ const SCHEMA_CONFIG_PRE_TEMPLATE_MERGE = Joi.object()
             }),
             otherwise: SCHEMA_SHARED
         }),
-        cache: SCHEMA_CACHE.when('template', { is: Joi.exist(), then: Joi.forbidden() }),
-        childPipelines: SCHEMA_CHILD_PIPELINES.when('template', { is: Joi.exist(), then: Joi.forbidden() }),
+        cache: SCHEMA_CACHE,
+        childPipelines: SCHEMA_CHILD_PIPELINES,
         stages: SCHEMA_STAGES.when('template', { is: Joi.exist(), then: Joi.forbidden() }),
-        subscribe: SCHEMA_SUBSCRIBE.when('template', { is: Joi.exist(), then: Joi.forbidden() }),
-        parameters: Parameters.parameters.default({}).when('template', { is: Joi.exist(), then: Joi.forbidden() })
+        subscribe: SCHEMA_SUBSCRIBE,
+        parameters: Parameters.parameters.default({})
     })
     .unknown(false);
 

package/config/pipelineTemplate.js

@@ -1,17 +1,20 @@
 'use strict';
 
 const Joi = require('joi');
-const JobsSchema = require('./base').jobs;
-const Shared = require('./base').shared;
+const BaseSchema = require('./base');
+const Annotations = require('./annotations');
 const Parameters = require('./parameters');
 const Template = require('./template');
 const Regex = require('./regex');
 
 const SCHEMA_CONFIG = Joi.object()
     .keys({
-        jobs: JobsSchema.required(),
-        shared: Shared,
-        parameters: Parameters.parameters.default({})
+        jobs: BaseSchema.jobs.required(),
+        shared: BaseSchema.shared,
+        parameters: Parameters.parameters.default({}),
+        annotations: Annotations.annotations,
+        cache: BaseSchema.cache,
+        subscribe: BaseSchema.subscribe
     })
     .unknown(false);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-data-schema",
-  "version": "23.1.0",
+  "version": "23.2.0",
   "description": "Internal Data Schema of Screwdriver",
   "main": "index.js",
   "scripts": {