diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-08-16 14:53:34 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-08-16 14:53:34 +0200 |
| commit | ff7b148ba83d45491cec11f1e1e11247368d9d79 (patch) | |
| tree | 94b9f71b688c1688703ae2da700afc9b80de7bbc /jjb/functest/functest-pi.yaml | |
| parent | bf336ebc09db7ed012c4b2d15c9f0f175d5e086a (diff) | |
Apply new env and volume regexes
Change-Id: I622d6e9f61c1a4fc1b9b6b2715eaa4d435a2e446
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/functest-pi.yaml')
| -rw-r--r-- | jjb/functest/functest-pi.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml index 8c7092303..52dc042e4 100644 --- a/jjb/functest/functest-pi.yaml +++ b/jjb/functest/functest-pi.yaml @@ -126,11 +126,11 @@ set +x volumes=; if [ "{volumes}" != "None" ]; then - for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done + for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done fi env=; if [ "{env}" != "None" ]; then - for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done + for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done fi [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then @@ -689,11 +689,11 @@ set +x volumes=; if [ "{volumes}" != "None" ]; then - for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done + for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); do volumes="-v $i $volumes"; done fi env=; if [ "{env}" != "None" ]; then - for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done + for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); do env="-e $i $env"; done fi [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true if [ "{repo}" = "_" ]; then |