diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-09-19 10:14:49 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-09-19 10:33:27 +0200 |
| commit | dece25372d52734a58f00bb1547195e9e138625a (patch) | |
| tree | d422eab358b6b314af66e62c851bbba316c68a94 /jjb/functest/functest.yaml | |
| parent | 492c28556906ef83b8fd300ad71003dd7b0c0560 (diff) | |
Update buildargs logic
Change-Id: I393e5669f190ddf81cf2afcc9e153809686d5f1c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/functest.yaml')
| -rw-r--r-- | jjb/functest/functest.yaml | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 31a448cde..7a0be506a 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -116,11 +116,13 @@ 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 @@ -579,11 +581,13 @@ 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 @@ -866,7 +870,8 @@ fi build_args="" if [ "{buildargs}" != "None" ]; then - build_args="{buildargs}" + for i in $(eval echo {buildargs} | tr -d '[]' |sed "s/, / /g" ); \ + do build_args="--build-arg $i $build_args"; done fi if [ "{ref_arg}" != "None" ]; then build_args="$build_args --build-arg {ref_arg}={ref}" |