From c1ad7ca467a200bb3c3b422afc5285b178948e9d Mon Sep 17 00:00:00 2001 From: Dayanand Sagar Date: Thu, 29 Aug 2024 09:50:53 -0700 Subject: [PATCH 1/4] feat(3171): Move pipeline template workflowGraph out of config into a new field (BREAKING CHANGE) --- package.json | 10 ++++---- test/plugins/pipelines.templates.test.js | 30 ++++++++++++------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 45e88095a..f4f03aaec 100644 --- a/package.json +++ b/package.json @@ -103,10 +103,10 @@ "screwdriver-build-bookend": "^4.0.0", "screwdriver-cache-bookend": "^3.0.0", "screwdriver-command-validator": "^3.0.0", - "screwdriver-config-parser": "^10.4.1", + "screwdriver-config-parser": "file:../config-parser/screwdriver-config-parser-10.0.0.tgz", "screwdriver-coverage-bookend": "^2.0.0", "screwdriver-coverage-sonar": "^4.1.1", - "screwdriver-data-schema": "^23.7.0", + "screwdriver-data-schema": "file:../data-schema/screwdriver-data-schema-22.0.0.tgz", "screwdriver-datastore-sequelize": "^8.2.0", "screwdriver-executor-base": "^9.0.1", "screwdriver-executor-docker": "^6.0.0", @@ -115,7 +115,7 @@ "screwdriver-executor-queue": "^4.0.0", "screwdriver-executor-router": "^3.0.0", "screwdriver-logger": "^2.0.0", - "screwdriver-models": "^29.18.4", + "screwdriver-models": "file:../models/screwdriver-models-29.0.0.tgz", "screwdriver-notifications-email": "^3.0.0", "screwdriver-notifications-slack": "^5.0.0", "screwdriver-request": "^2.0.1", @@ -124,8 +124,8 @@ "screwdriver-scm-github": "^12.6.0", "screwdriver-scm-gitlab": "^3.1.0", "screwdriver-scm-router": "^7.1.0", - "screwdriver-template-validator": "^8.2.0", - "screwdriver-workflow-parser": "^4.4.1", + "screwdriver-template-validator": "file:../template-validator/screwdriver-template-validator-8.0.0.tgz", + "screwdriver-workflow-parser": "file:../workflow-parser/screwdriver-workflow-parser-4.0.0.tgz", "sqlite3": "^5.1.4", "stream": "0.0.3", "tinytim": "^0.1.1", diff --git a/test/plugins/pipelines.templates.test.js b/test/plugins/pipelines.templates.test.js index 0763a72ec..17f7a471b 100644 --- a/test/plugins/pipelines.templates.test.js +++ b/test/plugins/pipelines.templates.test.js @@ -417,21 +417,21 @@ describe('pipeline plugin test', () => { sourcePaths: [] } }, - parameters: {}, - workflowGraph: { - edges: [], - nodes: [ - { - name: '~pr' - }, - { - name: '~commit' - }, - { - name: 'main' - } - ] - } + parameters: {} + }, + workflowGraph: { + edges: [], + nodes: [ + { + name: '~pr' + }, + { + name: '~commit' + }, + { + name: 'main' + } + ] } } }); From e627c1954db66e35a4e6043eee0ab401496b9d73 Mon Sep 17 00:00:00 2001 From: Dayanand Sagar Date: Wed, 4 Sep 2024 08:38:37 -0700 Subject: [PATCH 2/4] feat(3171): Upgrade dependencies --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f4f03aaec..56c5e2498 100644 --- a/package.json +++ b/package.json @@ -103,10 +103,10 @@ "screwdriver-build-bookend": "^4.0.0", "screwdriver-cache-bookend": "^3.0.0", "screwdriver-command-validator": "^3.0.0", - "screwdriver-config-parser": "file:../config-parser/screwdriver-config-parser-10.0.0.tgz", + "screwdriver-config-parser": "^11.0.0", "screwdriver-coverage-bookend": "^2.0.0", "screwdriver-coverage-sonar": "^4.1.1", - "screwdriver-data-schema": "file:../data-schema/screwdriver-data-schema-22.0.0.tgz", + "screwdriver-data-schema": "^24.0.0", "screwdriver-datastore-sequelize": "^8.2.0", "screwdriver-executor-base": "^9.0.1", "screwdriver-executor-docker": "^6.0.0", @@ -115,7 +115,7 @@ "screwdriver-executor-queue": "^4.0.0", "screwdriver-executor-router": "^3.0.0", "screwdriver-logger": "^2.0.0", - "screwdriver-models": "file:../models/screwdriver-models-29.0.0.tgz", + "screwdriver-models": "^30.0.0", "screwdriver-notifications-email": "^3.0.0", "screwdriver-notifications-slack": "^5.0.0", "screwdriver-request": "^2.0.1", @@ -124,8 +124,8 @@ "screwdriver-scm-github": "^12.6.0", "screwdriver-scm-gitlab": "^3.1.0", "screwdriver-scm-router": "^7.1.0", - "screwdriver-template-validator": "file:../template-validator/screwdriver-template-validator-8.0.0.tgz", - "screwdriver-workflow-parser": "file:../workflow-parser/screwdriver-workflow-parser-4.0.0.tgz", + "screwdriver-template-validator": "^9.0.0", + "screwdriver-workflow-parser": "^5.0.0", "sqlite3": "^5.1.4", "stream": "0.0.3", "tinytim": "^0.1.1", From f98f369cf4a698152b677ef7a3daf3fdc804937d Mon Sep 17 00:00:00 2001 From: Dayanand Sagar Date: Wed, 4 Sep 2024 16:22:50 -0700 Subject: [PATCH 3/4] feat(3171): Upgrading dependencies --- package.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 56c5e2498..56ba37fb9 100644 --- a/package.json +++ b/package.json @@ -107,23 +107,23 @@ "screwdriver-coverage-bookend": "^2.0.0", "screwdriver-coverage-sonar": "^4.1.1", "screwdriver-data-schema": "^24.0.0", - "screwdriver-datastore-sequelize": "^8.2.0", - "screwdriver-executor-base": "^9.0.1", - "screwdriver-executor-docker": "^6.0.0", - "screwdriver-executor-k8s": "^15.0.1", - "screwdriver-executor-k8s-vm": "^4.3.3", - "screwdriver-executor-queue": "^4.0.0", - "screwdriver-executor-router": "^3.0.0", + "screwdriver-datastore-sequelize": "^9.0.0", + "screwdriver-executor-base": "^10.0.0", + "screwdriver-executor-docker": "^7.0.0", + "screwdriver-executor-k8s": "^16.0.0", + "screwdriver-executor-k8s-vm": "^5.0.0", + "screwdriver-executor-queue": "^5.0.0", + "screwdriver-executor-router": "^4.0.0", "screwdriver-logger": "^2.0.0", "screwdriver-models": "^30.0.0", - "screwdriver-notifications-email": "^3.0.0", - "screwdriver-notifications-slack": "^5.0.0", + "screwdriver-notifications-email": "^4.0.0", + "screwdriver-notifications-slack": "^6.0.0", "screwdriver-request": "^2.0.1", - "screwdriver-scm-base": "^8.2.0", - "screwdriver-scm-bitbucket": "^5.0.1", - "screwdriver-scm-github": "^12.6.0", - "screwdriver-scm-gitlab": "^3.1.0", - "screwdriver-scm-router": "^7.1.0", + "screwdriver-scm-base": "^9.0.0", + "screwdriver-scm-bitbucket": "^6.0.0", + "screwdriver-scm-github": "^13.0.0", + "screwdriver-scm-gitlab": "^4.0.0", + "screwdriver-scm-router": "^8.0.0", "screwdriver-template-validator": "^9.0.0", "screwdriver-workflow-parser": "^5.0.0", "sqlite3": "^5.1.4", From db864afe18fa6652130ba737e5378b5bc09e318f Mon Sep 17 00:00:00 2001 From: Dayanand Sagar Date: Thu, 5 Sep 2024 13:18:10 -0700 Subject: [PATCH 4/4] feat(3171): Fix tests --- test/plugins/pipelines.templates.test.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/plugins/pipelines.templates.test.js b/test/plugins/pipelines.templates.test.js index 17f7a471b..1529b703b 100644 --- a/test/plugins/pipelines.templates.test.js +++ b/test/plugins/pipelines.templates.test.js @@ -280,11 +280,11 @@ describe('pipeline plugin test', () => { sourcePaths: [] } }, - parameters: {}, - workflowGraph: { - nodes: [{ name: '~pr' }, { name: '~commit' }, { name: 'main' }], - edges: [] - } + parameters: {} + }, + workflowGraph: { + nodes: [{ name: '~pr' }, { name: '~commit' }, { name: 'main' }], + edges: [] }, pipelineId: 123 };