Merge branch 'master' into release

s4sdkJenkinsBot · s4sdkJenkinsBot · commit 94dc66cd7105 · 2020-07-21T09:10:40.000Z
diff --git a/build.gradle b/build.gradle
@@ -46,7 +46,7 @@ test {
 }
 
 task downloadPiper(type: Download) {
-    src 'https://github.com/SAP/jenkins-library/releases/download/v1.54.0/jenkins-library.jar'
+    src 'https://github.com/SAP/jenkins-library/releases/download/v1.58.0/jenkins-library.jar'
     dest 'libs/jenkins-library.jar'
     onlyIfModified true
 }
diff --git a/resources/containers_map.yml b/resources/containers_map.yml
@@ -42,7 +42,7 @@ containerMaps:
     - executeNpm
   endToEndTests:
     - mavenExecute
-    - executeNpm
+    - npmExecuteScripts
     - cloudFoundryDeploy
     - neoDeploy
     - cloudFoundryCreateService
@@ -62,7 +62,7 @@ containerMaps:
     - sonarExecuteScan
   productionDeployment:
     - mavenExecute
-    - executeNpm
+    - npmExecuteScripts
     - cloudFoundryDeploy
     - neoDeploy
     - cloudFoundryCreateService
diff --git a/resources/default_s4_pipeline_environment.yml b/resources/default_s4_pipeline_environment.yml
@@ -53,11 +53,14 @@ steps:
   testsPublishResults:
     junit:
       active: true
-      pattern: '**/target/surefire-reports/*.xml,s4hana_pipeline/reports/backend-unit/**,s4hana_pipeline/reports/frontend-integration/**/*.xml'
+      pattern: '**/target/surefire-reports/*.xml,s4hana_pipeline/reports/backend-unit/**,s4hana_pipeline/reports/frontend-integration/**/*.xml,s4hana_pipeline/reports/e2e/*.xml'
     jacoco:
       active: false
     cobertura:
       active: false
+    cucumber:
+      active: false
+      pattern: 's4hana_pipeline/reports/e2e/*.json'
 
   checkFindbugs:
     includeFilterFile: s4hana_findbugs_include_filter.xml
@@ -132,3 +135,12 @@ stages:
 
   s4SdkQualityChecks:
     disabledChecks: []
+
+  endToEndTests:
+    stageLocking: true
+    lockingResource: 'endToEndTest'
+
+  productionDeployment:
+    stageLocking: true
+    lockingResource: 'productionDeployment'
+    ordinal: 80
diff --git a/src/com/sap/cloud/sdk/s4hana/pipeline/E2ETestCommandHelper.groovy b/src/com/sap/cloud/sdk/s4hana/pipeline/E2ETestCommandHelper.groovy
diff --git a/src/com/sap/cloud/sdk/s4hana/pipeline/EndToEndTestType.groovy b/src/com/sap/cloud/sdk/s4hana/pipeline/EndToEndTestType.groovy
diff --git a/vars/checkLegacyConfiguration.groovy b/vars/checkLegacyConfiguration.groovy
@@ -17,6 +17,8 @@ def call(Map parameters) {
     checkArtifactSetVersion(script)
     checkAutomaticVersioning(script)
     checkGlobalExtensionConfiguration(script)
+    checkTmsUpload(script)
+    checkEndToEndTestsAppUrl(script)
 }
 
 void checkGlobalExtensionConfiguration(Script script) {
@@ -84,6 +86,16 @@ void checkStaticCodeChecksConfig(Script script) {
     }
 }
 
+void checkTmsUpload(Script script) {
+    if (loadEffectiveStageConfiguration(script: script, stageName: 'productionDeployment').tmsUpload) {
+        failWithConfigError("Your pipeline configuration contains an entry tmsUpload in the stage productionDeployment. " +
+            "This configuration option was removed in version v39. " +
+            "Please configure the step tmsUpload instead. " +
+            "Details can be found in the release notes at https://github.com/SAP/cloud-s4-sdk-pipeline/releases/tag/v39 as well as in the step documentation: https://sap.github.io/jenkins-library/steps/tmsUpload/."
+        )
+    }
+}
+
 void checkSharedConfig(Script script) {
     if (script.commonPipelineEnvironment.configuration.general?.sharedConfiguration) {
         failWithConfigError("Your pipeline configuration contains an entry for the sharedConfiguration in the general section. " +
@@ -123,6 +135,47 @@ void checkAutomaticVersioning(Script script){
     }
 }
 
+void checkEndToEndTestsAppUrl(Script script) {
+    Map e2eStageConfig = loadEffectiveStageConfiguration(script: script, stageName: 'endToEndTests')
+    Map prodStageConfig = loadEffectiveStageConfiguration(script: script, stageName: 'productionDeployment')
+
+    if (e2eStageConfig?.appUrls instanceof String) {
+        failWithConfigError("The configuration key appUrls in the endToEndTests stage configuration must not be a string anymore. " +
+            "Please configure appUrls as a list of maps. For example:\n" +
+            "appUrls: \n" + "  - url: 'https://my-url.com'\n" + "    credentialId: myCreds\n" +
+            "More details can be found in the documentation: https://sap.github.io/jenkins-library/steps/npmExecuteEndToEndTests/#parameters")
+    }
+    if (prodStageConfig?.appUrls instanceof String) {
+        failWithConfigError("The configuration key appUrls in the productionDeployment stage configuration must not be a string anymore. " +
+            "Please configure appUrls as a list of maps. For example:\n" +
+            "appUrls: \n" + "  - url: 'https://my-url.com'\n" + "    credentialId: myCreds\n" +
+            "More details can be found in the documentation: https://sap.github.io/jenkins-library/steps/npmExecuteEndToEndTests/#parameters")
+    }
+
+    if (e2eStageConfig?.appUrls) {
+        for (int i = 0; i < e2eStageConfig.appUrls.size(); i++) {
+            Map appUrl = e2eStageConfig.appUrls[i]
+            if (appUrl.parameters instanceof String) {
+                failWithConfigError("The configuration key parameters in the endToEndTests stage configuration must not be a string anymore. " +
+                    "Please configure parameters as a list of strings. For example:\n" +
+                    "appUrls: \n" + "  - url: 'https://my-url.com'\n" + "    parameters: ['--tag', 'scenario1']\n" +
+                    "More details can be found in the documentation: https://sap.github.io/jenkins-library/steps/npmExecuteEndToEndTests/#parameters")
+            }
+        }
+    }
+    if (prodStageConfig?.appUrls) {
+        for (int i = 0; i < prodStageConfig.appUrls.size(); i++) {
+            Map appUrl = prodStageConfig.appUrls[i]
+            if (appUrl.parameters instanceof String) {
+                failWithConfigError("The configuration key parameters in the productionDeployment stage configuration must not be a string anymore. " +
+                    "Please configure parameters as a list of strings. For example:\n" +
+                    "appUrls: \n" + "  - url: 'https://my-url.com'\n" + "    parameters: ['--tag', 'scenario1']\n" +
+                    "More details can be found in the documentation: https://sap.github.io/jenkins-library/steps/npmExecuteEndToEndTests/#parameters")
+            }
+        }
+    }
+}
+
 private checkRenamedStep(Script script, String oldName, String newName) {
     if (loadEffectiveStepConfiguration(script: script, stepName: oldName)) {
         failWithConfigError("The configuration key ${oldName} in the steps configuration may not be used anymore. " +
diff --git a/vars/checkoutAndInitLibrary.groovy b/vars/checkoutAndInitLibrary.groovy
@@ -10,7 +10,7 @@ def call(Map parameters) {
 
     Map scmCheckoutResult = checkout(parameters.checkoutMap ?: scm)
 
-    initS4SdkPipelineLibrary script: script, configFile: parameters.configFile, customDefaults: parameters.customDefaults
+    initS4SdkPipelineLibrary script: script, configFile: parameters.configFile, customDefaults: parameters.customDefaults, customDefaultsFromFiles: parameters.customDefaultsFromFiles
 
     if (scmCheckoutResult.GIT_COMMIT) {
         ReportAggregator.instance.reportVersionControlUsed('Git')
diff --git a/vars/cloudSdkPipeline.groovy b/vars/cloudSdkPipeline.groovy
@@ -57,7 +57,7 @@ void call(parameters) {
                 parallel {
                     stage("End to End Tests") {
                         when { expression { parameters.script.commonPipelineEnvironment.configuration.runStage.E2E_TESTS } }
-                        steps { stageEndToEndTests script: parameters.script }
+                        steps { piperPipelineStageAcceptance script: parameters.script, stageName: 'endToEndTests' }
                     }
                     stage("Performance Tests") {
                         when { expression { parameters.script.commonPipelineEnvironment.configuration.runStage.PERFORMANCE_TESTS } }
@@ -110,8 +110,8 @@ void call(parameters) {
 
             stage('Production Deployment') {
                 when { expression { parameters.script.commonPipelineEnvironment.configuration.runStage.PRODUCTION_DEPLOYMENT } }
-                //milestone 80 is set in stageProductionDeployment
-                steps { stageProductionDeployment script: parameters.script }
+                // "ordinal 80" is configured for stage "productionDeployment" in pipeline defaults
+                steps { piperPipelineStageRelease script: parameters.script, stageName: 'productionDeployment' }
             }
 
         }
diff --git a/vars/executeEndToEndTest.groovy b/vars/executeEndToEndTest.groovy
diff --git a/vars/initS4sdkPipeline.groovy b/vars/initS4sdkPipeline.groovy
@@ -44,16 +44,18 @@ def call(Map parameters) {
 
     script.commonPipelineEnvironment.gitCommitId = getGitCommitId()
 
+    script.commonPipelineEnvironment.projectName = projectName
     String prefix = projectName
 
     script.commonPipelineEnvironment.configuration.currentBuildResultLock = "${prefix}/currentBuildResult"
     script.commonPipelineEnvironment.configuration.performanceTestLock = "${prefix}/performanceTest"
-    script.commonPipelineEnvironment.configuration.endToEndTestLock = "${prefix}/endToEndTest"
-    script.commonPipelineEnvironment.configuration.productionDeploymentLock = "${prefix}/productionDeployment"
     script.commonPipelineEnvironment.configuration.stashFiles = "${prefix}/stashFiles/${env.BUILD_TAG}"
 
     initNpmModules()
 
+    //todo load with customized default config for now until issue 8490 is resolved
+    piperInitRunStageConfiguration script: script, stageConfigResource: 'com.sap.piper/pipeline/cloudSdkStageDefaults.yml'
+
     initStageSkipConfiguration script: script
 }
 
diff --git a/vars/initStageSkipConfiguration.groovy b/vars/initStageSkipConfiguration.groovy
@@ -156,5 +156,5 @@ private boolean endToEndTestsShouldRun(script) {
         return false
     }
 
-    return stageConfig && script.fileExists('package.json')
+    return stageConfig.appUrls && script.fileExists('package.json')
 }
diff --git a/vars/loadPiper.groovy b/vars/loadPiper.groovy
@@ -6,7 +6,7 @@ def call(Map parameters = [:]) {
     Script script = parameters.script
 
     // If you change the version please also update the version in build.gradle. They must always be at the same commit/tag/version.
-    String piperOsVersion = 'v1.54.0'
+    String piperOsVersion = 'v1.58.0'
 
     String piperIdentifier = 'None'
 
diff --git a/vars/runClosures.groovy b/vars/runClosures.groovy
diff --git a/vars/stageEndToEndTests.groovy b/vars/stageEndToEndTests.groovy
@@ -1,7 +1,6 @@
 import com.sap.cloud.sdk.s4hana.pipeline.QualityCheck
 import com.sap.cloud.sdk.s4hana.pipeline.ReportAggregator
 import com.sap.piper.ConfigurationLoader
-import com.sap.cloud.sdk.s4hana.pipeline.EndToEndTestType
 
 def call(Map parameters = [:]) {
     def stageName = 'endToEndTests'
@@ -22,7 +21,7 @@ def call(Map parameters = [:]) {
                 script: script,
                 stage: stageName
             )
-            executeEndToEndTest script: script, appUrls: stageConfiguration.appUrls, endToEndTestType: EndToEndTestType.END_TO_END_TEST, stage: stageName
+            npmExecuteEndToEndTests script: script, runScript: 'ci-e2e', stageName: stageName
             ReportAggregator.instance.reportTestExecution(QualityCheck.EndToEndTests)
         }
     }
diff --git a/vars/stageInitS4sdkPipeline.groovy b/vars/stageInitS4sdkPipeline.groovy
@@ -14,7 +14,7 @@ def call(Map parameters) {
         deleteDir()
         // The checkout has to happen outside of initS4sdkPipeline, in order for it to be extensible.
         // (An extension to "initS4sdkPipeline" has to exist in the workspace before entering piperStageWrapper.)
-        checkoutAndInitLibrary(script: script, configFile: parameters.configFile, customDefaults: parameters.customDefaults)
+        checkoutAndInitLibrary(script: script, configFile: parameters.configFile, customDefaults: parameters.customDefaults, customDefaultsFromFiles: parameters.customDefaultsFromFiles)
 
         stash allowEmpty: true, excludes: '', includes: '**', useDefaultExcludes: false, name: 'INIT'
         script.commonPipelineEnvironment.configuration.stageStashes = [ initS4sdkPipeline: [ unstash : ["INIT"]]]
diff --git a/vars/stageProductionDeployment.groovy b/vars/stageProductionDeployment.groovy
@@ -1,6 +1,5 @@
 import com.sap.cloud.sdk.s4hana.pipeline.ReportAggregator
 import com.sap.piper.ConfigurationLoader
-import com.sap.cloud.sdk.s4hana.pipeline.EndToEndTestType
 import com.sap.cloud.sdk.s4hana.pipeline.BuildToolEnvironment
 
 def call(Map parameters = [:]) {
@@ -44,12 +43,7 @@ def call(Map parameters = [:]) {
                         )
                     }
                     finally {
-                        executeEndToEndTest(
-                            script: script,
-                            appUrls: stageConfiguration.appUrls,
-                            endToEndTestType: EndToEndTestType.SMOKE_TEST,
-                            stage: stageName
-                        )
+                        npmExecuteEndToEndTests script: script, runScript: 'ci-smoke', stageName: stageName
                     }
                 } else {
                     multicloudDeploy(

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ test {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`task downloadPiper(type: Download) {`
`49`		`- src 'https://github.com/SAP/jenkins-library/releases/download/v1.54.0/jenkins-library.jar'`
	`49`	`+ src 'https://github.com/SAP/jenkins-library/releases/download/v1.58.0/jenkins-library.jar'`
`50`	`50`	`dest 'libs/jenkins-library.jar'`
`51`	`51`	`onlyIfModified true`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ void call(parameters) {`
`57`	`57`	`parallel {`
`58`	`58`	`stage("End to End Tests") {`
`59`	`59`	`when { expression { parameters.script.commonPipelineEnvironment.configuration.runStage.E2E_TESTS } }`
`60`		`- steps { stageEndToEndTests script: parameters.script }`
	`60`	`+ steps { piperPipelineStageAcceptance script: parameters.script, stageName: 'endToEndTests' }`
`61`	`61`	`}`
`62`	`62`	`stage("Performance Tests") {`
`63`	`63`	`when { expression { parameters.script.commonPipelineEnvironment.configuration.runStage.PERFORMANCE_TESTS } }`
`@@ -110,8 +110,8 @@ void call(parameters) {`
`110`	`110`
`111`	`111`	`stage('Production Deployment') {`
`112`	`112`	`when { expression { parameters.script.commonPipelineEnvironment.configuration.runStage.PRODUCTION_DEPLOYMENT } }`
`113`		`- //milestone 80 is set in stageProductionDeployment`
`114`		`- steps { stageProductionDeployment script: parameters.script }`
	`113`	`+ // "ordinal 80" is configured for stage "productionDeployment" in pipeline defaults`
	`114`	`+ steps { piperPipelineStageRelease script: parameters.script, stageName: 'productionDeployment' }`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`}`