summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/functest/functest-kubernetes-ng.yaml13
-rw-r--r--jjb/functest/functest-kubernetes.yaml11
-rw-r--r--jjb/functest/functest.yaml11
-rw-r--r--jjb/functest/xtesting.yaml11
4 files changed, 46 insertions, 0 deletions
diff --git a/jjb/functest/functest-kubernetes-ng.yaml b/jjb/functest/functest-kubernetes-ng.yaml
index 6f1cb328f..ab6dbf27b 100644
--- a/jjb/functest/functest-kubernetes-ng.yaml
+++ b/jjb/functest/functest-kubernetes-ng.yaml
@@ -16,41 +16,49 @@
branch: stable/leguer
slave: lf-virtual1
dependency: 3.12
+ from: s/:leguer$/:v1.20/g
- v1.19:
buildargs:
branch: stable/kali
slave: lf-virtual1
dependency: 3.11
+ from: s/:kali$/:v1.19/g
- v1.18:
branch: stable/kali
slave: lf-virtual1
dependency: 3.11
buildargs: --build-arg K8S_TAG=1.18
+ from: s/:kali$/:v1.18/g
- v1.17:
buildargs:
branch: stable/jerma
slave: lf-virtual1
dependency: 3.10
+ from: s/:jerma$/:v1.17/g
- v1.16:
branch: stable/jerma
slave: lf-virtual1
dependency: 3.10
buildargs: --build-arg K8S_TAG=1.16
+ from: s/:jerma$/:v1.16/g
- v1.15:
buildargs:
branch: stable/iruya
slave: lf-virtual1
dependency: 3.9
+ from: s/:iruya$/:v1.15/g
- v1.14:
branch: stable/iruya
slave: lf-virtual1
dependency: 3.9
buildargs: --build-arg K8S_TAG=1.14
+ from: s/:iruya$/:v1.14/g
- v1.13:
buildargs:
branch: stable/hunter
slave: lf-virtual1
dependency: 3.9
+ from: s/:hunter$/:v1.13/g
- functest-kubernetes-ng-jobs: &functest-kubernetes-ng-jobs
name: 'functest-kubernetes-ng-jobs'
@@ -70,6 +78,7 @@
ref_arg: '{ref_arg}'
path: '{path}'
buildargs: '{buildargs}'
+ from: '{from}'
- builder:
name: functest-kubernetes-ng-build-containers
@@ -91,6 +100,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 .
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 3fd45e43b..be97d69a3 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -12,31 +12,37 @@
port:
tag:
- latest:
+ from:
buildargs:
branch: master
slave: lf-virtual1-6
dependency: 3.13
- leguer:
+ from:
buildargs:
branch: stable/leguer
slave: lf-virtual1-5
dependency: 3.12
- kali:
+ from:
buildargs:
branch: stable/kali
slave: lf-virtual1-4
dependency: 3.11
- jerma:
+ from:
buildargs:
branch: stable/jerma
slave: lf-virtual1-3
dependency: 3.10
- iruya:
+ from:
buildargs:
branch: stable/iruya
slave: lf-virtual1-2
dependency: 3.9
- hunter:
+ from:
buildargs:
branch: stable/hunter
slave: lf-virtual1-1
@@ -476,6 +482,7 @@
ref_arg: '{ref_arg}'
path: '{path}'
buildargs: '{buildargs}'
+ from: '{from}'
- builder:
name: functest-kubernetes-build-containers
@@ -497,6 +504,10 @@
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 \
-t $image .
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index d259f44e6..00ed5b1e5 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -12,36 +12,42 @@
port:
tag:
- latest:
+ from:
buildargs:
branch: master
slave: lf-virtual9
DASHBOARD_URL: http://172.30.13.94
dependency: 3.13
- leguer:
+ from:
buildargs:
branch: stable/leguer
slave: lf-virtual9
DASHBOARD_URL: http://172.30.13.94
dependency: 3.12
- kali:
+ from:
buildargs:
branch: stable/kali
slave: lf-pod4-3
DASHBOARD_URL: http://172.30.12.88
dependency: 3.11
- jerma:
+ from:
buildargs:
branch: stable/jerma
slave: lf-pod4
DASHBOARD_URL: http://172.30.12.83
dependency: 3.10
- iruya:
+ from:
buildargs:
branch: stable/iruya
slave: lf-virtual4
DASHBOARD_URL: http://172.30.13.89
dependency: 3.9
- hunter:
+ from:
buildargs:
branch: stable/hunter
slave: lf-virtual6
@@ -685,6 +691,7 @@
ref_arg: '{ref_arg}'
path: '{path}'
buildargs: '{buildargs}'
+ from: '{from}'
- builder:
name: functest-build-containers
@@ -706,6 +713,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 .
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 .