screwdriver-data-schema 25.1.2 → 25.1.4

package/config/regex.js

@@ -67,7 +67,7 @@ module.exports = {
     EXTERNAL_TRIGGER_AND: /^sd@(\d+):(?:([\w-]+)|(stage@([\w-]+):setup))$/,
     // External trigger (OR and AND case)
     // Can be ~sd@123:component or sd@123:component
-    EXTERNAL_TRIGGER_ALL: /^~?sd@(\d+):(?:([\w-]+)|(stage@([\w-]+):setup))$/,
+    EXTERNAL_TRIGGER_ALL: /^~?sd@(\d+):(([\w-]+)|(stage@([\w-]+):setup))$/,
 
     // Can be ~pr, ~commit, ~release, ~tag or ~commit:branchName, or ~sd@123:component
     // Note: if you modify this regex, you must modify `sdJoi` definition in the `config/job.js`

package/migrations/20250318145743-add-pipelineId-and-archived-index-to-jobs.js

@@ -0,0 +1,19 @@
+/* eslint-disable new-cap */
+
+'use strict';
+
+const prefix = process.env.DATASTORE_SEQUELIZE_PREFIX || '';
+const table = `${prefix}jobs`;
+
+module.exports = {
+    // eslint-disable-next-line no-unused-vars
+    up: async (queryInterface, Sequelize) => {
+        await queryInterface.sequelize.transaction(async transaction => {
+            await queryInterface.addIndex(table, {
+                name: `${table}_pipelineId_archived`,
+                fields: ['pipelineId', 'archived'],
+                transaction
+            });
+        });
+    }
+};

package/models/job.js

@@ -140,5 +140,10 @@ module.exports = {
      * @property indexes
      * @type {Array}
      */
-    indexes: [{ fields: ['pipelineId', 'state'] }, { fields: ['state'] }, { fields: ['templateId', 'archived'] }]
+    indexes: [
+        { fields: ['pipelineId', 'state'] },
+        { fields: ['state'] },
+        { fields: ['templateId', 'archived'] },
+        { fields: ['pipelineId', 'archived'] }
+    ]
 };

package/package.json

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