jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-20 05:19:40 +02:00
Code Issues Releases Activity

Align stage name (#1922)

Browse Source 
* Set env.STAGE_NAME to stageName from params
* Revert #1796
This commit is contained in:
Stephan Aßmus 2020-08-13 17:01:22 +02:00 committed by GitHub
parent 0b47748386
commit 6a71feeafd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
test/groovy/PiperStageWrapperTest.groovy
View File

@ -129,7 +129,42 @@ class PiperStageWrapperTest extends BasePiperTest {
}
assertThat(executed, is(true))
assertThat(executedOnKubernetes, is(true))
assertThat(customEnv[0].toString(), is("POD_NAME=test"))
assertThat(customEnv[1].toString(), is("POD_NAME=test"))
}
@Test
void testStageNameInEnv() {
def executed = false
binding.variables.env.STAGE_NAME = 'label'
stepRule.step.piperStageWrapper(
script: nullScript,
juStabUtils: utils,
stageName: 'test',
ordinal: 10
) {
executed = true
}
assertThat(executed, is(true))
assertThat(customEnv[0].toString(), is("STAGE_NAME=test"))
}
@Test
void testStageNameAlreadyInEnv() {
def executed = false
binding.variables.env.STAGE_NAME = 'test'
stepRule.step.piperStageWrapper(
script: nullScript,
juStabUtils: utils,
ordinal: 10
) {
executed = true
}
assertThat(executed, is(true))
assertThat(customEnv.size(), is(0))
}
@Test

13
vars/piperPipelineStageAcceptance.groovy
View File

@ -78,19 +78,19 @@ void call(Map parameters = [:]) {
} else {
if (config.cloudFoundryDeploy) {
durationMeasure(script: script, measurementName: 'deploy_test_cf_duration') {
cloudFoundryDeploy script: script, stageName: stageName
cloudFoundryDeploy script: script
}
}
if (config.neoDeploy) {
durationMeasure(script: script, measurementName: 'deploy_test_neo_duration') {
neoDeploy script: script, stageName: stageName
neoDeploy script: script
}
}
}
if (config.healthExecuteCheck) {
healthExecuteCheck script: script, stageName: stageName
healthExecuteCheck script: script
}
@ -100,7 +100,7 @@ void call(Map parameters = [:]) {
if (config.gaugeExecuteTests) {
durationMeasure(script: script, measurementName: 'gauge_duration') {
publishResults = true
gaugeExecuteTests script: script, stageName: stageName
gaugeExecuteTests script: script
publishMap += [gauge: [archive: true]]
}
}
@ -108,14 +108,14 @@ void call(Map parameters = [:]) {
if (config.newmanExecute) {
durationMeasure(script: script, measurementName: 'newman_duration') {
publishResults = true
newmanExecute script: script, stageName: stageName
newmanExecute script: script
}
}
if (config.uiVeri5ExecuteTests) {
durationMeasure(script: script, measurementName: 'uiveri5_duration') {
publishResults = true
uiVeri5ExecuteTests script: script, stageName: stageName
uiVeri5ExecuteTests script: script
}
}
@ -126,7 +126,6 @@ void call(Map parameters = [:]) {
}
if (publishResults) {
publishMap.stageName = stageName
testsPublishResults publishMap
}
}

8
vars/piperPipelineStageBuild.groovy
View File

@ -54,11 +54,11 @@ void call(Map parameters = [:]) {
durationMeasure(script: script, measurementName: 'build_duration') {
buildExecute script: script, stageName: stageName
pipelineStashFilesAfterBuild script: script, stageName: stageName
buildExecute script: script
pipelineStashFilesAfterBuild script: script
testsPublishResults script: script, junit: [updateResults: true], stageName: stageName
checksPublishResults script: script, stageName: stageName
testsPublishResults script: script, junit: [updateResults: true]
checksPublishResults script: script
}
}
}

4
vars/piperPipelineStageIntegration.groovy
View File

@ -46,12 +46,12 @@ void call(Map parameters = [:]) {
try {
if (config.npmExecuteScripts) {
publishResults = true
npmExecuteScripts script: script, stageName: stageName
npmExecuteScripts script: script
}
}
finally {
if (publishResults) {
testsPublishResults script: script, stageName: stageName
testsPublishResults script: script
}
}
}

10
vars/piperPipelineStageRelease.groovy
View File

@ -65,25 +65,25 @@ void call(Map parameters = [:]) {
} else {
if (config.cloudFoundryDeploy) {
durationMeasure(script: script, measurementName: 'deploy_release_cf_duration') {
cloudFoundryDeploy script: script, stageName: stageName
cloudFoundryDeploy script: script
}
}
if (config.neoDeploy) {
durationMeasure(script: script, measurementName: 'deploy_release_neo_duration') {
neoDeploy script: script, stageName: stageName
neoDeploy script: script
}
}
}
if (config.tmsUpload) {
durationMeasure(script: script, measurementName: 'upload_release_tms_duration') {
tmsUpload script: script, stageName: stageName
tmsUpload script: script
}
}
if (config.healthExecuteCheck) {
healthExecuteCheck script: script, stageName: stageName
healthExecuteCheck script: script
}
if (config.npmExecuteEndToEndTests) {
@ -93,7 +93,7 @@ void call(Map parameters = [:]) {
}
if (config.githubPublishRelease) {
githubPublishRelease script: script, stageName: stageName
githubPublishRelease script: script
}
}

6
vars/piperStageWrapper.groovy
View File

@ -32,6 +32,12 @@ void call(Map parameters = [:], body) {
stageLocking(config) {
def containerMap = ContainerMap.instance.getMap().get(stageName) ?: [:]
List environment = []
if (stageName && stageName != env.STAGE_NAME) {
// Avoid two sources of truth with regards to stageName.
// env.STAGE_NAME is filled from stage('Display name') {, it only serves the purpose of
// easily getting to the stage name from steps.
environment.add("STAGE_NAME=${stageName}")
}
if (config.sidecarImage) {
echo "sidecarImage configured for stage '${stageName}': '${config.sidecarImage}'"
environment.add("SIDECAR_IMAGE=${config.sidecarImage}")