diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-15 02:03:02 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-15 02:03:02 +0100 |
| commit | d826e782106c84161fae89c3e185072422fa5ac7 (patch) | |
| tree | e98f1736ba31c61f7e4f55b3408e88ea5cb77066 /jjb/functest/functest.yaml | |
| parent | 90d43f97fc1459a09f7584a87dc7081ec51b6ba1 (diff) | |
Allowing seding from in Dockerfile
https://build.opnfv.org/ci/job/functest-kubernetes-ng-opnfv-functest-kubernetes-benchmarking-v1.20-build/2/console
Change-Id: Ia9e2f4c659c274020e14aea788bdd99b28804700
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/functest.yaml')
| -rw-r--r-- | jjb/functest/functest.yaml | 11 |
1 files changed, 11 insertions, 0 deletions
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 . |