From ddc40044a2df0a11425f3d9a52219d3daeda92e1 Mon Sep 17 00:00:00 2001
From: Christopher Fenner <Christopher.Fenner@sap.com>
Date: Mon, 19 Nov 2018 10:54:14 +0100
Subject: [PATCH] karmaExecuteTests: extend default proxy excludes and stashes
 (#389)

* extend default proxy excludes

* Update karmaExecuteTests.md
---
 documentation/docs/steps/karmaExecuteTests.md | 6 +++---
 resources/default_pipeline_environment.yml    | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/documentation/docs/steps/karmaExecuteTests.md b/documentation/docs/steps/karmaExecuteTests.md
index 764b7ed3a..712642b8f 100644
--- a/documentation/docs/steps/karmaExecuteTests.md
+++ b/documentation/docs/steps/karmaExecuteTests.md
@@ -25,7 +25,7 @@ In the Docker network, the containers can be referenced by the values provided i
 | ----------|-----------|---------|-----------------|
 |script|yes|||
 |containerPortMappings|no|`[node:8-stretch: [[containerPort: 9876, hostPort: 9876]]]`||
-|dockerEnvVars|no|||
+|dockerEnvVars|no|`[ NO_PROXY: 'localhost,karma,$NO_PROXY', no_proxy: 'localhost,karma,$no_proxy']`||
 |dockerImage|no|`node:8-stretch`||
 |dockerName|no|`karma`||
 |dockerWorkspace|no|`/home/node`||
@@ -33,11 +33,11 @@ In the Docker network, the containers can be referenced by the values provided i
 |installCommand|no|`npm install --quiet`||
 |modules|no|`['.']`||
 |runCommand|no|`npm run karma`||
-|sidecarEnvVars|no|||
+|sidecarEnvVars|no|`[ NO_PROXY: 'localhost,selenium,$NO_PROXY', no_proxy: 'localhost,selenium,$no_proxy']`||
 |sidecarImage|no|||
 |sidecarName|no|||
 |sidecarVolumeBind|no|||
-|stashContent|no|||
+|stashContent|no|`['buildDescriptor', 'tests']`||
 
 - `script` - defines the global script environment of the Jenkinsfile run. Typically `this` is passed to this parameter. This allows the function to access the [`commonPipelineEnvironment`](commonPipelineEnvironment.md) for storing the measured duration.
 - `containerPortMappings` - see step [dockerExecute](dockerExecute.md)
diff --git a/resources/default_pipeline_environment.yml b/resources/default_pipeline_environment.yml
index ec3c6fbbb..c7f6c2149 100644
--- a/resources/default_pipeline_environment.yml
+++ b/resources/default_pipeline_environment.yml
@@ -187,6 +187,9 @@ steps:
       'node:8-stretch':
         - containerPort: 9876
           hostPort: 9876
+    dockerEnvVars:
+      NO_PROXY: 'localhost,selenium,$NO_PROXY'
+      no_proxy: 'localhost,selenium,$no_proxy'
     dockerImage: 'node:8-stretch'
     dockerName: 'karma'
     dockerWorkspace: '/home/node'
@@ -194,6 +197,12 @@ steps:
     modules:
       - '.'
     runCommand: 'npm run karma'
+    sidecarEnvVars:
+      NO_PROXY: 'localhost,karma,$NO_PROXY'
+      no_proxy: 'localhost,karma,$no_proxy'
+    stashContent:
+      - buildDescriptor
+      - tests
   mailSendNotification:
     notificationAttachment: true
     notifyCulprits: true