screwdriver-data-schema 21.16.1 → 21.19.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -29,7 +29,8 @@ const RESERVED_PIPELINE_ANNOTATIONS = [
29
29
  'screwdriver.cd/buildCluster',
30
30
  'screwdriver.cd/restrictPR',
31
31
  'screwdriver.cd/chainPR',
32
- 'screwdriver.cd/pipelineDescription'
32
+ 'screwdriver.cd/pipelineDescription',
33
+ 'screwdriver.cd/useDeployKey'
33
34
  ];
34
35
 
35
36
  /**
@@ -69,8 +69,49 @@ const SCHEMA_PROVIDER = Joi.object().keys({
69
69
  .example('eks'),
70
70
  clusterName: Joi.string()
71
71
  .max(128)
72
- .description('Cluster name')
73
- .example('sd-build-eks')
72
+ .description('Cluster name required if executor is eks')
73
+ .example('sd-build-eks'),
74
+ cpuLimit: Joi.string()
75
+ .max(4)
76
+ .description('CPU Limit for pod in EKS Cluster')
77
+ .example('2Gi'),
78
+ memoryLimit: Joi.string()
79
+ .max(4)
80
+ .description('Memory Limit for pod in EKS Cluster')
81
+ .example('4Gi'),
82
+ executorLogs: Joi.boolean()
83
+ .optional()
84
+ .default(false)
85
+ .description('Enable debug logs for executor codebuild'),
86
+ launcherImage: Joi.string()
87
+ .description('Screwdriver launcher image in user Registry')
88
+ .example('123456789012.dkr.ecr.us-east-2.amazonaws.com/screwdriver-hub:launcherv6.4'),
89
+ launcherVersion: Joi.string()
90
+ .description('Screwdriver launcher version')
91
+ .example('v6.4'),
92
+ privilegedMode: Joi.boolean()
93
+ .optional()
94
+ .default(false)
95
+ .description('Enable privileged mode for container'),
96
+ computeType: Joi.string()
97
+ .valid(
98
+ 'BUILD_GENERAL1_SMALL',
99
+ 'BUILD_GENERAL1_LARGE',
100
+ 'BUILD_GENERAL1_MEDIUM',
101
+ 'BUILD_GENERAL1_LARGE',
102
+ 'BUILD_GENERAL1_2XLARGE',
103
+ 'BUILD_GENERAL1_LARGE',
104
+ 'BUILD_GENERAL1_MEDIUM',
105
+ 'BUILD_GENERAL1_LARGE'
106
+ )
107
+ .optional()
108
+ .default('BUILD_GENERAL1_SMALL')
109
+ .description('CodeBuild compute type'),
110
+ environment: Joi.string()
111
+ .optional()
112
+ .valid('ARM_CONTAINER', 'LINUX_CONTAINER', 'LINUX_GPU_CONTAINER')
113
+ .default('LINUX_CONTAINER')
114
+ .description('CodeBuild environment type')
74
115
  });
75
116
 
76
117
  module.exports = {
@@ -0,0 +1,21 @@
1
+ /* eslint-disable new-cap */
2
+
3
+ 'use strict';
4
+
5
+ const prefix = process.env.DATASTORE_SEQUELIZE_PREFIX || '';
6
+ const table = `${prefix}events`;
7
+
8
+ module.exports = {
9
+ // eslint-disable-next-line no-unused-vars
10
+ up: async (queryInterface, Sequelize) => {
11
+ await queryInterface.sequelize.transaction(async transaction => {
12
+ await queryInterface.removeConstraint(table, `${table}_createTime_sha_key`, { transaction });
13
+
14
+ await queryInterface.addConstraint(table, ['sha', 'createTime', 'pipelineId'], {
15
+ name: `${table}_createTime_sha_pid_key`,
16
+ type: 'unique',
17
+ transaction
18
+ });
19
+ });
20
+ }
21
+ };
package/models/event.js CHANGED
@@ -166,7 +166,7 @@ module.exports = {
166
166
  * @property keys
167
167
  * @type {Array}
168
168
  */
169
- keys: ['sha', 'createTime'],
169
+ keys: ['sha', 'createTime', 'pipelineId'],
170
170
 
171
171
  /**
172
172
  * Primary column to sort queries by.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "screwdriver-data-schema",
3
- "version": "21.16.1",
3
+ "version": "21.19.1",
4
4
  "description": "Internal Data Schema of Screwdriver",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -43,15 +43,16 @@
43
43
  "eslint": "^7.32.0",
44
44
  "eslint-config-screwdriver": "^5.0.1",
45
45
  "js-yaml": "^3.14.1",
46
- "mocha": "^8.4.0",
46
+ "mocha": "^9.2.0",
47
47
  "mocha-multi-reporters": "^1.5.1",
48
48
  "mocha-sonarqube-reporter": "^1.0.2",
49
49
  "mysql2": "^1.7.0",
50
50
  "nyc": "^15.0.0",
51
51
  "pg": "^7.18.2",
52
52
  "sequelize": "^5.22.5",
53
- "sequelize-cli": "^5.5.1",
54
- "sqlite3": "^5.0.0"
53
+ "sequelize-cli": "^6.4.1",
54
+ "sqlite3": "^4.2.0",
55
+ "npx": "^10.2.2"
55
56
  },
56
57
  "dependencies": {
57
58
  "cron-parser": "^4.2.1",