diff options
| author |   Ed Warnicke <hagbard@gmail.com> | 2016-10-17 17:57:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2016-10-17 17:57:36 +0000 |
| commit | ac1bfbb11515c51aa361f19a1cfed064f9f8da2f (patch) | |
| tree | 54df674122b73a1c0ca84f3401dbeb6fc3f21186 /jjb/vpp | |
| parent | 2d286c0bfff820a47ba091d3952c6f3c6c7daa9d (diff) | |
| parent | 21316a6aa857071e89e4d512613a785eddac2ae5 (diff) | |
Merge "Use fdio-infra-wrappers to simplify common wrapper use"
Diffstat (limited to 'jjb/vpp')
| -rw-r--r-- | jjb/vpp/vpp-lite.yaml | 17 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 29 |
2 files changed, 7 insertions, 39 deletions
diff --git a/jjb/vpp/vpp-lite.yaml b/jjb/vpp/vpp-lite.yaml index 6574f5310..7f55c8a22 100644 --- a/jjb/vpp/vpp-lite.yaml +++ b/jjb/vpp/vpp-lite.yaml @@ -58,9 +58,8 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-submitted: @@ -101,9 +100,8 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit: @@ -160,9 +158,8 @@ choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-merged: @@ -173,4 +170,4 @@ - shell: !include-raw-escape: include-raw-vpp-checkstyle.sh - shell: - !include-raw-escape: 'include-raw-vpp-lite-build.sh'
\ No newline at end of file + !include-raw-escape: 'include-raw-vpp-lite-build.sh' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 3310efb93..911c48496 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -87,10 +87,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -206,10 +202,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -268,10 +260,6 @@ choosing-strategy: 'default' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -335,10 +323,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -393,10 +377,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -457,10 +437,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -518,10 +494,6 @@ choosing-strategy: 'default' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -566,4 +538,3 @@ fingerprint: false only-if-success: true default-excludes: false - |