diff options
| author |   gwu <gary.i.wu@huawei.com> | 2018-07-17 14:12:09 -0700 |
|---|---|---|
| committer | gwu <gary.i.wu@huawei.com> | 2018-07-17 14:15:20 -0700 |
| commit | adeda5ac33fdb2dfe4be6a0455e726d2e9b1b1c4 (patch) | |
| tree | 278d74454a65c0e79dd61b4e7f6ccef6e47283f1 | |
| parent | 5bb3fee2d953634f9fff6c16ab9e3c52a957e770 (diff) | |
Add infra-wrappers-docker-build
Refactor infra-wrappers config for docker builds for
use by other docker build job templates
Change-Id: I6b72ecea28e24b809627b97fa998f930a63c65f4
Issue-ID: INT-588
Signed-off-by: gwu <gary.i.wu@huawei.com>
| -rw-r--r-- | jjb/global-macros.yaml | 17 | ||||
| -rw-r--r-- | jjb/global-templates-python.yaml | 13 |
2 files changed, 19 insertions, 11 deletions
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index abf7a83f3..1f751da62 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -452,3 +452,20 @@ - 'onap-jenkins-ssh' - openstack: single-use: true + +- wrapper: + # This wrapper is used for docker build jobs to use the dedicated docker + # build VM and turn off OpenStack single-use + name: infra-wrappers-docker-build + wrappers: + - timestamps + - timeout: + type: absolute + timeout: '{build-timeout}' + timeout-var: 'BUILD_TIMEOUT' + fail: true + - ssh-agent-credentials: + users: + - 'onap-jenkins-ssh' + - openstack: + single-use: false diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index 24dba8737..98312bb55 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -188,17 +188,8 @@ checkout-dir: '{checkout-dir3}' wrappers: - - timestamps - - timeout: - type: absolute - timeout: '{build-timeout}' - timeout-var: 'BUILD_TIMEOUT' - fail: true - - ssh-agent-credentials: - users: - - 'onap-jenkins-ssh' - - openstack: - single-use: false + - infra-wrappers-docker-build: + build-timeout: '{build-timeout}' triggers: - timed: '@daily' |