Skip to content
This repository was archived by the owner on Nov 2, 2023. It is now read-only.

Commit 71fb714

Browse files
author
s4sdkJenkinsBot
committed
Merge branch 'master' into release
2 parents f247060 + a55de07 commit 71fb714

File tree

83 files changed

+75
-4892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+75
-4892
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
Please consider all items and remove only if not applicable.
77

88
- [ ] I carefully reviewed my own pull request before assigning someone.
9-
- [ ] Changes to the configuration are also documented in the [configuration.md](https://github.com/SAP/cloud-s4-sdk-pipeline/blob/master/configuration.md)
9+
- [ ] Changes to the configuration are also documented in the [configuration.md](https://github.com/SAP/jenkins-library/blob/master/documentation/docs/pipelines/cloud-sdk/configuration.md)
10+
- [ ] release-notes-draft.md is updated
1011
- [ ] Pipeline config schema is updated [in schema store](https://github.com/SchemaStore/schemastore/blob/master/src/schemas/json/cloud-sdk-pipeline-config-schema.json)
1112
- [ ] The [feature matrix](https://github.com/SAP/cloud-s4-sdk-pipeline/blob/master/doc/pipeline/build-tools.md#feature-matrix) is updated, if a new feature is added for one of the build tools
1213
- [ ] Important design decisions are documented as an [ADR](https://github.com/SAP/cloud-s4-sdk-pipeline/tree/master/doc/architecture/decisions)

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ test {
4747

4848
task downloadPiper(type: Download) {
4949

50-
src 'https://github.com/SAP/jenkins-library/releases/download/v1.82.0/jenkins-library.jar'
50+
src 'https://github.com/SAP/jenkins-library/releases/download/v1.92.0/jenkins-library.jar'
5151

5252
dest 'libs/jenkins-library.jar'
5353
onlyIfModified true

resources/blue_green_check.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

resources/check-ui5-best-practices/README.md

Lines changed: 0 additions & 18 deletions
This file was deleted.

resources/check-ui5-best-practices/package.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

resources/check-ui5-best-practices/run-ui5-lint.js

Lines changed: 0 additions & 75 deletions
This file was deleted.

resources/containers_map.yml

Lines changed: 0 additions & 68 deletions
This file was deleted.

resources/default_s4_pipeline_environment.yml

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ general:
77
runStageInPod: true
88
globalExtensionsDirectory: 's4hana_pipeline/extensions/'
99
inferBuildTool: true
10+
inferProjectName: true
11+
initCloudSdkStashSettings: true
12+
containerMapResource: 'com.sap.piper/pipeline/cloudSdkContainersMap.yml'
13+
legacyConfigSettings: 'com.sap.piper/pipeline/cloudSdkLegacyConfigSettings.yml'
14+
stageConfigResource: 'com.sap.piper/pipeline/cloudSdkStageDefaults.yml'
1015

1116
maven:
1217
m2Path: s4hana_pipeline/maven_local_repo
1318
mandatoryStages:
1419
- "initS4sdkPipeline"
1520
- "build"
1621
- "backendIntegrationTests"
17-
- "staticCodeChecks"
18-
- "unitTests"
19-
- "npmAudit"
20-
- "lint"
21-
- "frontendUnitTests"
22+
- "additionalUnitTests"
2223
- "frontendIntegrationTests"
23-
- "s4SdkQualityChecks"
2424
- "artifactDeployment"
2525
- "productionDeployment"
2626

@@ -105,18 +105,37 @@ steps:
105105
namedUser: "CLOUD_SDK_PIPELINE"
106106

107107
sonarExecuteScan:
108+
coverageExclusions: ["**.js", "unit-tests/**", "integration-tests/**", "performance-tests/**", "**.xml", "**/target/**"]
109+
inferJavaLibraries: true
110+
inferJavaBinaries: true
111+
inferBranchName: true
108112
dockerImage: 'ppiper/node-browsers:v3'
109113

110114
fortifyExecuteScan:
111115
buildTool: 'maven'
116+
stashContent:
117+
- "SOURCE"
118+
- "M2"
119+
- "TARGET"
120+
121+
whitesourceExecuteScan:
122+
useGoStep: true
123+
dockerImage: 'devxci/mbtci:1.0.14' #contains mvn, npm, npx -> the mtaBuild image for classic contains no npx!
124+
stashContent:
125+
- "SOURCE"
126+
- "M2"
127+
- "NODE_MODULES"
128+
- "PACKAGE_LOCK"
112129

113130
checkmarxExecuteScan:
114131
filterPattern: "!**/*.log, !**/*.lock, !**/*.json, !**/*.html, !**/Cx*, !**/test/**, !s4hana_pipeline/**, !**/unit-tests/**, !**/integration-tests/**, !**/frontend-unit-tests/**, !**/e2e-tests/**, !**/performance-tests/**, **/*.js, **/*.java, **/*.ts"
115132
preset: "36"
116133
vulnerabilityThresholdLow: 99999
117134
vulnerabilityThresholdMedium: 0
118135
vulnerabilityThresholdUnit: 'absolute'
119-
136+
stashContent:
137+
- "SOURCE"
138+
- "TARGET"
120139

121140
#Stage Specific Configurations
122141
stages:
@@ -138,7 +157,7 @@ stages:
138157
active: true
139158
pattern: 'integration-tests/target/surefire-reports/TEST-*.xml,s4hana_pipeline/reports/backend-integration/**'
140159

141-
frontendUnitTests:
160+
additionalUnitTests:
142161
runScripts: ['ci-frontend-unit-test']
143162
virtualFrameBuffer: true
144163
junit:
@@ -151,9 +170,6 @@ stages:
151170
pattern: "s4hana_pipeline/reports/**/report-html/ut/index.html"
152171
reportName: "Frontend Unit Test Coverage"
153172

154-
s4SdkQualityChecks:
155-
disabledChecks: []
156-
157173
endToEndTests:
158174
stageLocking: true
159175
lockingResource: 'endToEndTest'
@@ -164,8 +180,15 @@ stages:
164180
active: true
165181
pattern: 's4hana_pipeline/reports/e2e/*.json'
166182

183+
performanceTests:
184+
stageLocking: true
185+
lockingResource: 'performanceTests'
186+
167187
productionDeployment:
168188
enableZeroDowntimeDeployment: true
169189
stageLocking: true
170190
lockingResource: 'productionDeployment'
171191
ordinal: 80
192+
193+
security:
194+
runStageInPod: false

0 commit comments

Comments
 (0)