Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Take new backported test cases into account
[releng.git]
/
jjb
/
functest
/
xtesting.yaml
diff --git
a/jjb/functest/xtesting.yaml
b/jjb/functest/xtesting.yaml
index
ce823b9
..
5484a59
100644
(file)
--- a/
jjb/functest/xtesting.yaml
+++ b/
jjb/functest/xtesting.yaml
@@
-352,15
+352,14
@@
fi
build_args=""
if [ "{buildargs}" != "None" ]; then
fi
build_args=""
if [ "{buildargs}" != "None" ]; then
- build_args="{buildargs}
"
+ build_args="{buildargs}"
fi
if [ "{ref_arg}" != "None" ]; then
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
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 \
fi
sudo docker build $build_args \
--pull=false --no-cache --force-rm=true \