Merge branch 'master' into release

Author: s4sdkJenkinsBot

README.md

@@ -1,5 +1,6 @@
-# Pipeline Library for the SAP Cloud SDK
+# Pipeline Library for the SAP Cloud SDK - DEPRECATED!
 
+**WARNING:** This repository should not be used anymore. Instead, we recommend using the [General Purpose Pipeline of project "Piper"](https://sap.github.io/jenkins-library/stages/introduction/). The reasoning as well as further information how to adopt the General Purpose Pipeline are described in our [guide](https://github.com/SAP/cloud-s4-sdk-pipeline/blob/master/gpp-guide.md).
 
 ## Description
 

build.gradle

@@ -47,7 +47,7 @@ test {
 
 task downloadPiper(type: Download) {
 
-    src 'https://github.com/SAP/jenkins-library/releases/download/v1.99.0/jenkins-library.jar'
+    src 'https://github.com/SAP/jenkins-library/releases/download/v1.105.0/jenkins-library.jar'
 
     dest 'libs/jenkins-library.jar'
     onlyIfModified true

resources/default_s4_pipeline_environment.yml

@@ -88,6 +88,10 @@ steps:
     failThreshold: 100
     unstableThreshold: 90
 
+  gatlingExecuteTests:
+    pomPath: 'performance-tests/pom.xml'
+    stashContent: []
+
   cloudFoundryDeploy:
     dockerImage: ppiper/cf-cli:v2
     keepOldInstance: true

vars/checkGatling.groovy

@@ -44,7 +44,7 @@ def call(Map parameters = [:], Closure body) {
             echo "Creating a new HDI container ${hdiContainerName}"
             try {
                 createContainer(script, configuration, hdiContainerName)
-                initializeDatabase(script, hdiContainerName)
+                initializeDatabase(script)
                 body()
             } finally {
                 deleteContainer(script, configuration, hdiContainerName)
@@ -156,11 +156,9 @@ private createContainer(Script script, Map configuration, String hdiContainer) {
     }
 }
 
-private initializeDatabase(Script script, String hdiContainer) {
-    dir('db') {
-        echo "Deploying content"
-        npmExecuteScripts script: script, runScripts: ['start'], scriptOptions: ['--exit'], virtualFrameBuffer: false
-    }
+private initializeDatabase(Script script) {
+    echo "Deploying content"
+    npmExecuteScripts script: script, buildDescriptorList: ['db/package.json'], runScripts: ['start'], scriptOptions: ['--exit'], virtualFrameBuffer: false
 }
 
 private deleteContainer(Script script, Map configuration, String hdiContainerName) {

vars/createHdiContainer.groovy

@@ -5,7 +5,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.99.0'
+    String piperOsVersion = 'v1.105.0'
 
     String piperIdentifier = 'None'
 

vars/loadPiper.groovy

@@ -19,8 +19,9 @@ def call(Map parameters = [:]) {
                 checkJMeter script: script, reportDirectory: performanceTestReports
             }
 
-            if (ConfigurationLoader.stepConfiguration(script, 'checkGatling')?.enabled) {
-                checkGatling script: script, appUrls: stageConfiguration.appUrls
+            def gatlingConfig = ConfigurationLoader.stepConfiguration(script, 'gatlingExecuteTests')
+            if (gatlingConfig && gatlingConfig.enabled != false) {
+                gatlingExecuteTests script: script
             }
         } else {
             echo "Performance tests have not been enabled. Skipping the stage."