diff options
author | Cedric Ollivier <cedric.ollivier@orange.com> | 2021-08-16 13:01:40 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2021-08-16 13:01:40 +0000 |
commit | 771e830d60ab145538777ce8501aa09e4a2b2d1c (patch) | |
tree | 9f2aa3c764429b71918e3b2a8802307347796192 /jjb/functest/xtesting-pi.yaml | |
parent | eb8bcf335ac1f3629017b2cd21e19fb636b22630 (diff) | |
parent | ff7b148ba83d45491cec11f1e1e11247368d9d79 (diff) |
Merge "Apply new env and volume regexes"
Diffstat (limited to 'jjb/functest/xtesting-pi.yaml')
-rw-r--r-- | jjb/functest/xtesting-pi.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml index a8d55c059..a935dcb76 100644 --- a/jjb/functest/xtesting-pi.yaml +++ b/jjb/functest/xtesting-pi.yaml @@ -89,11 +89,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 @@ -259,11 +259,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 |