X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-macros.yaml;h=da6d726770b637c161e6658028278b337300ed54;hb=9fdb611f1fce34d54be1af81d7baedb86726302c;hp=d59a96449bfd972cb3fa1825c18e059f74b335fb;hpb=603bc6bed1996d666f34ec88b06d9c3dfc69d090;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index d59a9644..da6d7267 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -532,6 +532,7 @@ wipe-workspace: true submodule: recursive: '{submodule-recursive}' + timeout: '{submodule-timeout}' choosing-strategy: '{choosing-strategy}' - scm: @@ -547,6 +548,7 @@ wipe-workspace: true submodule: recursive: '{submodule-recursive}' + timeout: '{submodule-timeout}' choosing-strategy: '{choosing-strategy}' ############ @@ -554,7 +556,7 @@ ############ - wrapper: - name: lf-infra-wrappers + name: lf-infra-wrappers-common wrappers: - mask-passwords - timeout: @@ -563,14 +565,26 @@ timeout-var: 'BUILD_TIMEOUT' fail: true - timestamps - - ssh-agent-credentials: - users: - - '{jenkins-ssh-credential}' - openstack: single-use: true + +- wrapper: + name: lf-infra-wrappers + wrappers: + - lf-infra-wrappers-common: + build-timeout: '{build-timeout}' - config-file-provider: files: - file-id: npmrc target: '$HOME/.npmrc' - file-id: pipconf target: '$HOME/.config/pip/pip.conf' + - ssh-agent-credentials: + users: + - '{jenkins-ssh-credential}' + +- wrapper: + name: lf-infra-wrappers-windows + wrappers: + - lf-infra-wrappers-common: + build-timeout: '{build-timeout}'