diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-15 01:21:17 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-02-15 01:21:17 +0100 |
| commit | b4115573dd37fa715f42e889c667dac3dfdbd591 (patch) | |
| tree | fb2e5417fec33c44ff5db7f3900f8de13075335e /jjb/functest/functest.yaml | |
| parent | 2a0e7d31396e5cfaeb876dd1db3953817e2cdc25 (diff) | |
Manage build args (needed by K8s)
Change-Id: I3473fc0770edb1d74397217e0752bf6f0f98f33c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest/functest.yaml')
| -rw-r--r-- | jjb/functest/functest.yaml | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index fa416c9e7..5280d7bb3 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -12,31 +12,37 @@ port: tag: - latest: + buildargs: branch: master slave: lf-virtual9 DASHBOARD_URL: http://172.30.13.94 dependency: 3.13 - leguer: + buildargs: branch: stable/leguer slave: lf-virtual9 DASHBOARD_URL: http://172.30.13.94 dependency: 3.12 - kali: + buildargs: branch: stable/kali slave: lf-pod4-3 DASHBOARD_URL: http://172.30.12.88 dependency: 3.11 - jerma: + buildargs: branch: stable/jerma slave: lf-pod4 DASHBOARD_URL: http://172.30.12.83 dependency: 3.10 - iruya: + buildargs: branch: stable/iruya slave: lf-virtual4 DASHBOARD_URL: http://172.30.13.89 dependency: 3.9 - hunter: + buildargs: branch: stable/hunter slave: lf-virtual6 DASHBOARD_URL: http://172.30.13.91 @@ -678,6 +684,7 @@ <<: *functest-containers ref_arg: '{ref_arg}' path: '{path}' + buildargs: '{buildargs}' - builder: name: functest-build-containers @@ -691,13 +698,15 @@ else image={repo}:{port}/{container}:{tag} fi - if [ "{ref_arg}" = "None" ]; then - build_arg="" - else - build_arg="--build-arg {ref_arg}={ref}" + build_args="" + if [ "{buildargs}" != "None" ]; then + build_args="{buildargs} " + fi + if [ "{ref_arg}" != "None" ]; then + build_args="--build-arg {ref_arg}={ref}" fi cd {path} - sudo docker build $build_arg \ + sudo docker build $build_args \ --pull=false --no-cache --force-rm=true \ -t $image . @@ -809,6 +818,20 @@ jobs: - 'functest-{tag}-tox' +- job-template: + name: 'functest-{repo}-{container}-{tag}-gate' + parameters: + - functest-slave: + slave: '{slave}' + scm: + - functest-scm: + ref: $GERRIT_REFSPEC + builders: + - functest-build-containers: + <<: *functest-build-containers + ref: $GERRIT_REFSPEC + buildargs: '{buildargs}' + - project: name: functest-opnfv-functest-core-{tag}-gate <<: *functest-params @@ -887,19 +910,6 @@ - 'functest-{repo}-{container}-{tag}-gate' -- job-template: - name: 'functest-{repo}-{container}-{tag}-gate' - parameters: - - functest-slave: - slave: '{slave}' - scm: - - functest-scm: - ref: $GERRIT_REFSPEC - builders: - - functest-build-containers: - <<: *functest-build-containers - ref: $GERRIT_REFSPEC - - trigger: name: functest-patchset-created triggers: @@ -1183,6 +1193,7 @@ - functest-build-containers: <<: *functest-build-containers ref: '{branch}' + buildargs: '{buildargs}' - functest-push-containers: <<: *functest-build-containers ref: '{branch}' |