summaryrefslogtreecommitdiffstats
path: root/jjb/functest/xtesting.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest/xtesting.yaml')
-rw-r--r--jjb/functest/xtesting.yaml11
1 files changed, 11 insertions, 0 deletions
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index c0c4bac90..ce823b9ff 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -12,31 +12,37 @@
port:
tag:
- latest:
+ from:
buildargs:
branch: master
slave: lf-virtual1
dependency: 3.13
- leguer:
+ from:
buildargs:
branch: stable/leguer
slave: lf-virtual1
dependency: 3.12
- kali:
+ from:
buildargs:
branch: stable/kali
slave: lf-virtual1
dependency: 3.11
- jerma:
+ from:
buildargs:
branch: stable/jerma
slave: lf-virtual1
dependency: 3.10
- iruya:
+ from:
buildargs:
branch: stable/iruya
slave: lf-virtual1
dependency: 3.9
- hunter:
+ from:
buildargs:
branch: stable/hunter
slave: lf-virtual1
@@ -330,6 +336,7 @@
ref_arg: '{ref_arg}'
path: '{path}'
buildargs: '{buildargs}'
+ from: '{from}'
- builder:
name: xtesting-build-containers
@@ -351,6 +358,10 @@
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 \
-t $image .