Skip to content

Commit 2084fe6

Browse files
BraisVQBraisVQ
authored
Prepare release 4.10.0 (#1132)
1 parent 598c0cc commit 2084fe6

19 files changed

Lines changed: 105 additions & 48 deletions

‎CHANGELOG.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,21 @@
55
### Added
66

77

8+
### Changed
9+
10+
11+
### Fixed
12+
13+
14+
## [4.10.0] - 2025-10-13
815
### Changed
916
- Use npm ci in e2e-cypress quickstarter & Better TypeScript support in e2e-cypress quickstarter ([#1114](https://github.com/opendevstack/ods-quickstarters/pull/1114))
1017
- e2e-cypress get rid of additional chrome installation and switch to edge for pdf generation ([#1112](https://github.com/opendevstack/ods-quickstarters/pull/1112))
18+
- Fix for the integration of the Python Quickstarter and Zephyr ODS integration ([#1125](https://github.com/opendevstack/ods-quickstarters/pull/1125))
19+
- Added e2e-cypress specific versioning ([#1128](https://github.com/opendevstack/ods-quickstarters/pull/1128))
1120

1221
### Fixed
13-
22+
- Fix the credentials for the test environment for e2e-etl-python ([#1127](https://github.com/opendevstack/ods-quickstarters/pull/1127))
1423

1524
## [4.9.0] - 2025-8-06
1625
### Changed

‎be-python-flask/Jenkinsfile.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def stageTestSuite(def context) {
5151
script: """
5252
. ./testsuite/bin/activate
5353
PYTHONPATH=src python3.12 -m pytest --junitxml=tests.xml -o junit_family=xunit2 --cov-report term-missing --cov-report xml --cov=src -o testpaths=tests
54+
sed -i-e 's/test_//g' tests.xml
5455
""",
5556
returnStatus: true
5657
)

‎e2e-cypress/Jenkinsfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@ odsQuickstarterPipeline(
2323
odsQuickstarterStageRenderJenkinsfile(context)
2424

2525
odsQuickstarterStageRenderSonarProperties(context)
26+
27+
stage('Create package-lock.json') {
28+
dir(context.targetDir) {
29+
sh 'npm install --package-lock-only'
30+
}
31+
}
2632
}

‎e2e-cypress/Jenkinsfile.template‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ odsComponentPipeline(
3232

3333
def targetDirectory = "${context.projectId}/${context.componentId}/${context.gitBranch.replaceAll('/', '-')}/${context.buildNumber}"
3434

35+
stageInstall(context)
36+
stageTypeCheck(context)
3537
stageTest(context)
3638
odsComponentStageScanWithSonar(context)
3739

@@ -67,6 +69,19 @@ odsComponentPipeline(
6769
}
6870
}
6971

72+
73+
def stageInstall(def context) {
74+
stage('Install dependencies') {
75+
sh 'npm ci'
76+
}
77+
}
78+
79+
def stageTypeCheck(def context) {
80+
stage('Check types') {
81+
sh 'npx tsc --noEmit'
82+
}
83+
}
84+
7085
def stageTest(def context) {
7186
stage('Functional Tests') {
7287
// Define your DEV and QA base URLs in a config map in OpenShift; please adapt variable names to your OpenShift config
@@ -97,8 +112,6 @@ def stageTest(def context) {
97112
// usernamePassword(credentialsId: "${context.projectId}-cd-e2e-user", passwordVariable: 'CYPRESS_PASSWORD', usernameVariable: 'CYPRESS_USERNAME'),
98113
// string(credentialsId: "${context.projectId}-cd-otp-secret", variable: 'OTP_SECRET')
99114
]) {
100-
sh 'npm install'
101-
102115
// Note: Testing in the production environment is not enabled by default as it can lead to unintended consequences,
103116
// including potential downtime, data corruption, or exposure of sensitive information.
104117
// This block is designed to skip acceptance and integration tests in the production environment to avoid these risks.

‎e2e-cypress/README.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# End-to-end tests with Cypress (e2e-cypress)
22

3-
Documentation is located in our [official documentation](https://www.opendevstack.org/ods-documentation/ods-quickstarters/latest/index.html)
3+
This quickstarter tracks its own version in the files/package.json file. Make sure to update it accordingly.
44

5-
Please update documentation in the [antora page directory](https://github.com/opendevstack/ods-quickstarters/tree/master/docs/modules/ROOT/pages)
5+
Documentation is located in our [official documentation](https://www.opendevstack.org/ods-documentation/opendevstack/latest/quickstarters/e2e-cypress.html)
66

7-
Tested thru [automated tests](../tests/e2e-cypress)
7+
Please update documentation in the [antora page directory](https://github.com/opendevstack/ods-quickstarters/tree/master/docs/modules/quickstarters/pages)
8+
9+
Tested thru [automated tests](./testdata)

‎e2e-cypress/files/cypress-acceptance.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ export default defineConfig({
66
reporterOptions: {
77
...baseConfig.reporterOptions,
88
mochawesomeReporterOptions: {
9-
...baseConfig.reporterOptions.mochawesomeReporterOptions,
9+
...baseConfig.reporterOptions?.mochawesomeReporterOptions,
1010
reportFilename: 'acceptance-mochawesome',
1111
},
1212
reportersCustomReporterJsReporterOptions: {
13-
...baseConfig.reporterOptions.reportersCustomReporterJsReporterOptions,
13+
...baseConfig.reporterOptions?.reportersCustomReporterJsReporterOptions,
1414
mochaFile: 'build/test-results/acceptance-junit-[hash].xml',
1515
},
1616
},

‎e2e-cypress/files/cypress-installation.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ export default defineConfig({
66
reporterOptions: {
77
...baseConfig.reporterOptions,
88
mochawesomeReporterOptions: {
9-
...baseConfig.reporterOptions.mochawesomeReporterOptions,
9+
...baseConfig.reporterOptions?.mochawesomeReporterOptions,
1010
reportFilename: 'installation-mochawesome',
1111
},
1212
reportersCustomReporterJsReporterOptions: {
13-
...baseConfig.reporterOptions.reportersCustomReporterJsReporterOptions,
13+
...baseConfig.reporterOptions?.reportersCustomReporterJsReporterOptions,
1414
mochaFile: 'build/test-results/installation-junit-[hash].xml',
1515
},
1616
},

‎e2e-cypress/files/cypress-integration.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ export default defineConfig({
66
reporterOptions: {
77
...baseConfig.reporterOptions,
88
mochawesomeReporterOptions: {
9-
...baseConfig.reporterOptions.mochawesomeReporterOptions,
9+
...baseConfig.reporterOptions?.mochawesomeReporterOptions,
1010
reportFilename: 'integration-mochawesome',
1111
},
1212
reportersCustomReporterJsReporterOptions: {
13-
...baseConfig.reporterOptions.reportersCustomReporterJsReporterOptions,
13+
...baseConfig.reporterOptions?.reportersCustomReporterJsReporterOptions,
1414
mochaFile: 'build/test-results/integration-junit-[hash].xml',
1515
},
1616
},

‎e2e-cypress/files/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "e2e-cypress",
3-
"version": "0.0.0",
3+
"version": "1.0.0",
44
"license": "MIT",
55
"scripts": {
66
"start": "npm run cypress:open",
@@ -30,7 +30,7 @@
3030
"mochawesome": "^7.1.3",
3131
"npm-run-all": "^4.1.5",
3232
"otplib": "^12.0.1",
33-
"puppeteer": "^23.5.1",
33+
"puppeteer-core": "^24.4.0",
3434
"rimraf": "^6.0.1",
3535
"sharp": "^0.33.5",
3636
"ts-node": "^10.9.2",

‎e2e-cypress/files/pdf-generator.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as puppeteer from 'puppeteer';
1+
import * as puppeteer from 'puppeteer-core';
22
import * as path from 'path';
33
import * as fs from 'fs';
44
import baseConfig from './cypress.config';
@@ -12,7 +12,7 @@ async function expandReportTestCases(htmlPage: puppeteer.Page) {
1212
});
1313
}
1414

15-
const mochawesomeDir = path.resolve(__dirname, baseConfig.reporterOptions.mochawesomeReporterOptions.reportDir);
15+
const mochawesomeDir = path.resolve(__dirname, baseConfig.reporterOptions?.mochawesomeReporterOptions.reportDir ?? 'build/test-results/mochawesome');
1616

1717
const isLocal = process.env.NODE_ENV === 'local';
1818

@@ -26,7 +26,7 @@ const isLocal = process.env.NODE_ENV === 'local';
2626
continue;
2727
}
2828

29-
const executablePath = isLocal ? undefined : '/usr/bin/google-chrome';
29+
const executablePath = isLocal ? undefined : '/usr/bin/microsoft-edge';
3030

3131
const browser = await puppeteer.launch({ args: ['--no-sandbox'],
3232
executablePath

0 commit comments

Comments
 (0)