From f394ccf876df2f3b8b9fe452bc9a7b28fcade1f1 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 15 Apr 2022 13:35:14 +0200
Subject: Fix download campaign builder
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: If45d1f95030f773acda45d65af5caf2b21dc991d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/functest-kubernetes-pi.yaml | 6 ++++++
 jjb/functest/functest-kubernetes.yaml    | 6 ++++++
 jjb/functest/functest-pi.yaml            | 6 ++++++
 jjb/functest/functest.yaml               | 6 ++++++
 jjb/functest/xtesting-pi.yaml            | 6 ++++++
 jjb/functest/xtesting.yaml               | 6 ++++++
 6 files changed, 36 insertions(+)

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 340ae236c..aee60a83c 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -483,6 +483,8 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          mkdir -p $WORKSPACE/results
+          chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
             $volumes \
             $env \
@@ -512,6 +514,8 @@
           <<: *functest-kubernetes-pi-containers
           volumes: '{volumes}'
           env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
 
 - project:
     name: 'functest-kubernetes-pi-{tag}-zip'
@@ -522,6 +526,8 @@
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
       - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-healthcheck'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-pi-{tag}-zip'
 
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 53603ca7e..708c5d6f5 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -465,6 +465,8 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          mkdir -p $WORKSPACE/results
+          chown {uid}:{gid} $WORKSPACE/results
           docker run --rm \
             $volumes \
             $env \
@@ -494,6 +496,8 @@
           <<: *functest-kubernetes-containers
           volumes: '{volumes}'
           env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
 
 - project:
     name: 'functest-kubernetes-{tag}-zip'
@@ -504,6 +508,8 @@
       - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
       - E2E_TEST_OPTS=$E2E_TEST_OPTS
     container: 'functest-kubernetes-healthcheck'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-kubernetes-{tag}-zip'
 
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 23dcb51dc..39018c5c4 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -756,6 +756,8 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
             $volumes \
             $env \
@@ -787,6 +789,8 @@
           <<: *functest-pi-containers
           volumes: '{volumes}'
           env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
 
 - project:
     name: 'functest-pi-{tag}-zip'
@@ -799,6 +803,8 @@
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     container: 'functest-healthcheck'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-pi-{tag}-zip'
 
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 7d1172742..948e951f0 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -628,6 +628,8 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
             $volumes \
             $env \
@@ -659,6 +661,8 @@
           <<: *functest-containers
           volumes: '{volumes}'
           env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
 
 - project:
     name: 'functest-{tag}-zip'
@@ -671,6 +675,8 @@
       - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
       - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
     container: 'functest-healthcheck'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'functest-{tag}-zip'
 
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index 3fbfaf034..9e8bb80a2 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -291,6 +291,8 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
             $volumes \
             $env \
@@ -316,6 +318,8 @@
           <<: *xtesting-pi-containers
           volumes: '{volumes}'
           env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
 
 - project:
     name: 'xtesting-pi-{tag}-zip'
@@ -323,6 +327,8 @@
     volumes:
     env:
     container: 'xtesting'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'xtesting-pi-{tag}-zip'
 
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 193ec2dab..4d1bcb0fe 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -279,6 +279,8 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
             $volumes \
             $env \
@@ -304,6 +306,8 @@
           <<: *xtesting-containers
           volumes: '{volumes}'
           env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
 
 - project:
     name: 'xtesting-{tag}-zip'
@@ -311,6 +315,8 @@
     volumes:
     env:
     container: 'xtesting'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'xtesting-{tag}-zip'
 
-- 
cgit 1.2.3-korg