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
c0c4bac
..
5484a59
100644
(file)
--- a/
jjb/functest/xtesting.yaml
+++ b/
jjb/functest/xtesting.yaml
@@
-12,31
+12,37
@@
port:
tag:
- latest:
port:
tag:
- latest:
+ from:
buildargs:
branch: master
slave: lf-virtual1
dependency: 3.13
- leguer:
buildargs:
branch: master
slave: lf-virtual1
dependency: 3.13
- leguer:
+ from:
buildargs:
branch: stable/leguer
slave: lf-virtual1
dependency: 3.12
- kali:
buildargs:
branch: stable/leguer
slave: lf-virtual1
dependency: 3.12
- kali:
+ from:
buildargs:
branch: stable/kali
slave: lf-virtual1
dependency: 3.11
- jerma:
buildargs:
branch: stable/kali
slave: lf-virtual1
dependency: 3.11
- jerma:
+ from:
buildargs:
branch: stable/jerma
slave: lf-virtual1
dependency: 3.10
- iruya:
buildargs:
branch: stable/jerma
slave: lf-virtual1
dependency: 3.10
- iruya:
+ from:
buildargs:
branch: stable/iruya
slave: lf-virtual1
dependency: 3.9
- hunter:
buildargs:
branch: stable/iruya
slave: lf-virtual1
dependency: 3.9
- hunter:
+ from:
buildargs:
branch: stable/hunter
slave: lf-virtual1
buildargs:
branch: stable/hunter
slave: lf-virtual1
@@
-330,6
+336,7
@@
ref_arg: '{ref_arg}'
path: '{path}'
buildargs: '{buildargs}'
ref_arg: '{ref_arg}'
path: '{path}'
buildargs: '{buildargs}'
+ from: '{from}'
- builder:
name: xtesting-build-containers
- builder:
name: xtesting-build-containers
@@
-345,12
+352,15
@@
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}
fi
cd {path}
+ if [ "{from}" != "None" ]; then
+ sed -i {from} Dockerfile
+ fi
sudo docker build $build_args \
--pull=false --no-cache --force-rm=true \
-t $image .
sudo docker build $build_args \
--pull=false --no-cache --force-rm=true \
-t $image .