screwdriver-data-schema 21.22.0 → 21.23.0

package/config/annotations.js

@@ -23,7 +23,9 @@ const RESERVED_JOB_ANNOTATIONS = [
     'screwdriver.cd/terminationGracePeriodSeconds',
     'screwdriver.cd/displayName',
     'screwdriver.cd/mergeSharedSteps',
-    'screwdriver.cd/manualStartEnabled'
+    'screwdriver.cd/manualStartEnabled',
+    'screwdriver.cd/blockedBySameJob',
+    'screwdriver.cd/blockedBySameJobWaitTime'
 ];
 const RESERVED_PIPELINE_ANNOTATIONS = [
     'screwdriver.cd/buildCluster',

package/config/job.js

@@ -169,7 +169,9 @@ const SCHEMA_SOURCEPATH = Joi.string()
 const SCHEMA_SOURCEPATHS = Joi.alternatives().try(Joi.array().items(SCHEMA_SOURCEPATH), SCHEMA_SOURCEPATH);
 const SCHEMA_CACHE = Joi.boolean().optional();
 const SCHEMA_PARAMETERS = Parameters.parameters.optional();
-const SCHEMA_PROVIDER = Provider.provider.optional();
+const SCHEMA_PROVIDER = Joi.alternatives()
+    .try(Provider.provider, Joi.string().regex(Regex.CHECKOUT_URL))
+    .optional();
 const SCHEMA_JOB = Joi.object()
     .keys({
         annotations: Annotations.annotations,

package/config/provider.js

@@ -116,11 +116,15 @@ const SCHEMA_PROVIDER = Joi.object().keys({
         .optional()
         .default('BUILD_GENERAL1_SMALL')
         .description('CodeBuild compute type'),
-    environment: Joi.string()
+    environmentType: Joi.string()
         .optional()
         .valid('ARM_CONTAINER', 'LINUX_CONTAINER', 'LINUX_GPU_CONTAINER')
         .default('LINUX_CONTAINER')
-        .description('CodeBuild environment type')
+        .description('CodeBuild environment type'),
+    debugSession: Joi.boolean()
+        .optional()
+        .default(false)
+        .description('Enable debug session inside build container')
 });
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-data-schema",
-  "version": "21.22.0",
+  "version": "21.23.0",
   "description": "Internal Data Schema of Screwdriver",
   "main": "index.js",
   "scripts": {
@@ -39,7 +39,7 @@
     "debug": false
   },
   "devDependencies": {
-    "chai": "^4.2.0",
+    "chai": "^4.3.6",
     "eslint": "^7.32.0",
     "eslint-config-screwdriver": "^5.0.1",
     "js-yaml": "^3.14.1",
@@ -47,15 +47,15 @@
     "mocha-multi-reporters": "^1.5.1",
     "mocha-sonarqube-reporter": "^1.0.2",
     "mysql2": "^1.7.0",
+    "npx": "^10.2.2",
     "nyc": "^15.0.0",
     "pg": "^7.18.2",
     "sequelize": "^6.6.5",
     "sequelize-cli": "^6.4.1",
-    "sqlite3": "^4.2.0",
-    "npx": "^10.2.2"
+    "sqlite3": "^4.2.0"
   },
   "dependencies": {
     "cron-parser": "^4.2.1",
-    "joi": "^17.5.0"
+    "joi": "^17.6.0"
   }
 }

package/plugins/executor.js

@@ -3,6 +3,7 @@
 const Joi = require('joi');
 const Annotations = require('../config/annotations');
 const Job = require('../config/job');
+const Provider = require('../config/provider');
 const models = require('../models');
 const buildId = models.build.base.extract('id').required();
 const eventId = models.event.base.extract('id');
@@ -26,7 +27,7 @@ const buildSchemaObj = {
     jobName,
     jobState,
     jobArchived,
-    provider: Job.provider,
+    provider: Provider.provider.optional(),
     annotations: Annotations.annotations,
     blockedBy: Joi.array().items(jobId),
     freezeWindows: Job.freezeWindows,
@@ -64,7 +65,7 @@ const SCHEMA_STOP = Joi.object()
         jobId,
         token: Joi.string().label('Build JWT'),
         pipelineId,
-        provider: Job.provider,
+        provider: Provider.provider.optional(),
         apiUri: Joi.string()
             .uri()
             .required()
@@ -79,7 +80,7 @@ const SCHEMA_STATUS = Joi.object()
         token: Joi.string().label('Build JWT'),
         pipelineId,
         jobId,
-        provider: Job.provider
+        provider: Provider.provider.optional()
     })
     .unknown(true) // allow other fields
     .required();