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

Revert "allow multicloud deployment to run in current workspace (#2031)" (#2137)

Browse Source 
This reverts commit 32fd89c664.

Commit mentioned above has been merged in order to circumvent
the issue which has been resolved by commit 0a17ed56. Since this
issue is now resolved and since there is no other known use case
for running deployments explicitly in parallel we decided to remove
that flag again.
This commit is contained in:
Marcus Holl 2020-10-09 14:52:07 +02:00 committed by GitHub
parent ed97142f6d
commit 5f5372aa6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/default_pipeline_environment.yml
View File

@ -329,7 +329,6 @@ steps:
neoTargets: []
enableZeroDowntimeDeployment: false
parallelExecution: false
runInCurrentWorkspace: false
newmanExecute:
dockerImage: 'node:lts-stretch'
failOnError: true

16
test/groovy/MulticloudDeployTest.groovy
View File

@ -373,20 +373,4 @@ class MulticloudDeployTest extends BasePiperTest {
assertFalse(executedOnKubernetes)
}
@Test
void multicloudParallelOnCurrentWorkspaceTest() {
stepRule.step.multicloudDeploy([
script : nullScript,
enableZeroDowntimeDeployment: true,
parallelExecution : true,
source : 'file.mtar',
runInCurrentWorkspace : true
])
assertTrue(executedInParallel)
assertFalse(executedOnNode)
assertFalse(executedOnKubernetes)
}
}

14
vars/multicloudDeploy.groovy
View File

@ -13,9 +13,9 @@ import static com.sap.piper.Prerequisites.checkScript
@Field String STEP_NAME = getClass().getName()
@Field Set GENERAL_CONFIG_KEYS = [
/** Defines the targets to deploy to Cloud Foundry.*/
/** Defines the targets to deploy on Cloud Foundry.*/
'cfTargets',
/** Defines the targets to deploy to NEO.*/
/** Defines the targets to deploy on neo.*/
'neoTargets',
/** Executes the deployments in parallel.*/
'parallelExecution'
@ -35,16 +35,10 @@ import static com.sap.piper.Prerequisites.checkScript
'cfCreateServices',
/** Defines the deployment type.*/
'enableZeroDowntimeDeployment',
/** Runs all the deployments in the current workspace.
* It is recommended to use an isolated workspace while using blue-green deployment with multiple cfTargets,
* since the cloudFoundryDeploy step might edit the manifest.yml file in that case.
* It is also recommended in case of parallel execution and use of mtaExtensionCredentials, since the
* credentials are inserted in the mtaExtensionDescriptor file.*/
'runInCurrentWorkspace'
])
@Field Set PARAMETER_KEYS = STEP_CONFIG_KEYS.plus([
/** The source file to deploy to SAP Cloud Platform. Only for NEO targets.*/
/** The source file to deploy to SAP Cloud Platform.*/
'source'
])
@ -110,7 +104,7 @@ void call(parameters = [:]) {
// since the cloudFoundryDeploy step might edit the manifest.yml file in that case.
// It is also required in case of parallel execution and use of mtaExtensionCredentials, since the
// credentials are inserted in the mtaExtensionDescriptor file.
Boolean runInIsolatedWorkspace = config.cfTargets.size() > 1 && (deploymentType == "blue-green" || config.parallelExecution) && !config.runInCurrentWorkspace
Boolean runInIsolatedWorkspace = config.cfTargets.size() > 1 && (deploymentType == "blue-green" || config.parallelExecution)
for (int i = 0; i < config.cfTargets.size(); i++) {