diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-09-05 23:37:03 -0700 |
|---|---|---|
| committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2018-09-05 23:37:03 -0700 |
| commit | 8b5d0def0389d07a8e1da32077a5fe1d194f0e39 (patch) | |
| tree | 83f0f99d2b358602724e4af53afe8815abd2280c /jjb | |
| parent | 654bd03af21b420227068465dc7cb89ab471b308 (diff) | |
Move global-jjb parameter from releng to global
As these only affect jobs defined in global-jjb (no other jobs used
these variable names) they should be safe to define at the global level.
Change-Id: I646c3afc73757bff561cc84b80df064e13680080
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global/releng-defaults.yaml | 7 | ||||
| -rw-r--r-- | jjb/releng/releng-ci-jobs.yaml | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/jjb/global/releng-defaults.yaml b/jjb/global/releng-defaults.yaml index 2e94767e8..0caa3f29b 100644 --- a/jjb/global/releng-defaults.yaml +++ b/jjb/global/releng-defaults.yaml @@ -11,6 +11,13 @@ node: master + # Defaults for global-jjb jobs + build-node: 'opnfv-build' + gerrit-server-name: 'gerrit.opnfv.org' + jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' + jjb-version: '2.0.3' + lftools-version: '<1.0.0' + properties: - logrotate-default diff --git a/jjb/releng/releng-ci-jobs.yaml b/jjb/releng/releng-ci-jobs.yaml index 49abd7dd4..17fb6e42c 100644 --- a/jjb/releng/releng-ci-jobs.yaml +++ b/jjb/releng/releng-ci-jobs.yaml @@ -5,11 +5,6 @@ project-name: 'releng' build-timeout: 60 - build-node: 'lf-build1' - gerrit-server-name: 'gerrit.opnfv.org' - jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e' - jjb-version: '2.0.3' - lftools-version: '<1.0.0' rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-releng/38594/' rtd-token: '291c6a0109493b4457e566d06141212452c65784' |