screwdriver-data-schema 21.17.0 → 21.19.2

package/config/annotations.js

@@ -29,7 +29,8 @@ const RESERVED_PIPELINE_ANNOTATIONS = [
     'screwdriver.cd/buildCluster',
     'screwdriver.cd/restrictPR',
     'screwdriver.cd/chainPR',
-    'screwdriver.cd/pipelineDescription'
+    'screwdriver.cd/pipelineDescription',
+    'screwdriver.cd/useDeployKey'
 ];
 
 /**

package/config/provider.js

@@ -71,8 +71,17 @@ const SCHEMA_PROVIDER = Joi.object().keys({
         .max(128)
         .description('Cluster name required if executor is eks')
         .example('sd-build-eks'),
+    cpuLimit: Joi.string()
+        .max(4)
+        .description('CPU Limit for pod in EKS Cluster')
+        .example('2Gi'),
+    memoryLimit: Joi.string()
+        .max(4)
+        .description('Memory Limit for pod in EKS Cluster')
+        .example('4Gi'),
     executorLogs: Joi.boolean()
         .optional()
+        .default(false)
         .description('Enable debug logs for executor codebuild'),
     launcherImage: Joi.string()
         .description('Screwdriver launcher image in user Registry')
@@ -82,7 +91,27 @@ const SCHEMA_PROVIDER = Joi.object().keys({
         .example('v6.4'),
     privilegedMode: Joi.boolean()
         .optional()
-        .description('Enable privileged mode for container')
+        .default(false)
+        .description('Enable privileged mode for container'),
+    computeType: Joi.string()
+        .valid(
+            'BUILD_GENERAL1_SMALL',
+            'BUILD_GENERAL1_LARGE',
+            'BUILD_GENERAL1_MEDIUM',
+            'BUILD_GENERAL1_LARGE',
+            'BUILD_GENERAL1_2XLARGE',
+            'BUILD_GENERAL1_LARGE',
+            'BUILD_GENERAL1_MEDIUM',
+            'BUILD_GENERAL1_LARGE'
+        )
+        .optional()
+        .default('BUILD_GENERAL1_SMALL')
+        .description('CodeBuild compute type'),
+    environment: Joi.string()
+        .optional()
+        .valid('ARM_CONTAINER', 'LINUX_CONTAINER', 'LINUX_GPU_CONTAINER')
+        .default('LINUX_CONTAINER')
+        .description('CodeBuild environment type')
 });
 
 module.exports = {

package/migrations/20220203-uniquekey-update-events.js

@@ -0,0 +1,22 @@
+/* eslint-disable new-cap */
+
+'use strict';
+
+const prefix = process.env.DATASTORE_SEQUELIZE_PREFIX || '';
+const table = `${prefix}events`;
+
+module.exports = {
+    // eslint-disable-next-line no-unused-vars
+    up: async (queryInterface, Sequelize) => {
+        await queryInterface.sequelize.transaction(async transaction => {
+            await queryInterface.removeConstraint(table, `${table}_createTime_sha_key`, { transaction });
+
+            await queryInterface.addConstraint(table, {
+                fields: ['sha', 'createTime', 'pipelineId'],
+                name: `${table}_createTime_sha_pid_key`,
+                type: 'unique',
+                transaction
+            });
+        });
+    }
+};

package/models/event.js

@@ -166,7 +166,7 @@ module.exports = {
      * @property keys
      * @type {Array}
      */
-    keys: ['sha', 'createTime'],
+    keys: ['sha', 'createTime', 'pipelineId'],
 
     /**
      * Primary column to sort queries by.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-data-schema",
-  "version": "21.17.0",
+  "version": "21.19.2",
   "description": "Internal Data Schema of Screwdriver",
   "main": "index.js",
   "scripts": {
@@ -43,15 +43,16 @@
     "eslint": "^7.32.0",
     "eslint-config-screwdriver": "^5.0.1",
     "js-yaml": "^3.14.1",
-    "mocha": "^8.4.0",
+    "mocha": "^9.2.0",
     "mocha-multi-reporters": "^1.5.1",
     "mocha-sonarqube-reporter": "^1.0.2",
     "mysql2": "^1.7.0",
     "nyc": "^15.0.0",
     "pg": "^7.18.2",
-    "sequelize": "^5.22.5",
-    "sequelize-cli": "^5.5.1",
-    "sqlite3": "^5.0.0"
+    "sequelize": "^6.6.5",
+    "sequelize-cli": "^6.4.1",
+    "sqlite3": "^4.2.0",
+    "npx": "^10.2.2"
   },
   "dependencies": {
     "cron-parser": "^4.2.1",