diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-15 02:56:00 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-15 02:56:00 +0100 |
| commit | 6c8e1af2e5f78ff2d673175899ed6de56a99d8dd (patch) | |
| tree | 741af8c62cd613ec8810d64da63c7713b00b76e8 | |
| parent | c7bffea1721ac805371d700c68fe14aeb7ce2f03 (diff) | |
Fix build args logic
Change-Id: I2eadec7ac35a1cdeca25fad917b8f021ff2c15fa
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | jjb/functest/functest-kubernetes-ng.yaml | 5 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 5 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 5 | ||||
| -rw-r--r-- | jjb/functest/xtesting.yaml | 5 |
4 files changed, 8 insertions, 12 deletions
diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml index ab6dbf27b..c447d5398 100644 --- a/jjb/functest/functest-kubernetes-ng.yaml +++ b/jjb/functest/functest-kubernetes-ng.yaml @@ -94,15 +94,14 @@ fi build_args="" if [ "{buildargs}" != "None" ]; then - build_args="{buildargs} " + build_args="{buildargs}" fi if [ "{ref_arg}" != "None" ]; then - build_args="--build-arg {ref_arg}={ref}" + build_args="$build_args --build-arg {ref_arg}={ref}" fi cd {path} if [ "{from}" != "None" ]; then sed -i {from} Dockerfile - git diff fi sudo docker build $build_args \ --pull=false --no-cache --force-rm=true \ diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index be97d69a3..8c543966a 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -498,15 +498,14 @@ fi build_args="" if [ "{buildargs}" != "None" ]; then - build_args="{buildargs} " + build_args="{buildargs}" fi if [ "{ref_arg}" != "None" ]; then - build_args="--build-arg {ref_arg}={ref}" + build_args="$build_args --build-arg {ref_arg}={ref}" fi cd {path} if [ "{from}" != "None" ]; then sed -i {from} Dockerfile - git diff fi docker build $build_args \ --pull=false --no-cache --force-rm=true \ diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 00ed5b1e5..0c16041e2 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -707,15 +707,14 @@ fi build_args="" if [ "{buildargs}" != "None" ]; then - build_args="{buildargs} " + build_args="{buildargs}" fi if [ "{ref_arg}" != "None" ]; then - build_args="--build-arg {ref_arg}={ref}" + build_args="$build_args --build-arg {ref_arg}={ref}" fi cd {path} if [ "{from}" != "None" ]; then sed -i {from} Dockerfile - git diff fi sudo docker build $build_args \ --pull=false --no-cache --force-rm=true \ diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index ce823b9ff..5484a59f7 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -352,15 +352,14 @@ fi build_args="" if [ "{buildargs}" != "None" ]; then - build_args="{buildargs} " + build_args="{buildargs}" fi if [ "{ref_arg}" != "None" ]; then - build_args="--build-arg {ref_arg}={ref}" + build_args="$build_args --build-arg {ref_arg}={ref}" fi cd {path} if [ "{from}" != "None" ]; then sed -i {from} Dockerfile - git diff fi sudo docker build $build_args \ --pull=false --no-cache --force-rm=true \ |