summaryrefslogtreecommitdiffstats
path: root/jjb/vpp
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/vpp')
-rw-r--r--jjb/vpp/vpp-lite.yaml17
-rw-r--r--jjb/vpp/vpp.yaml29
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 587b68543..86f8efc94 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -86,10 +86,6 @@
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@ -139,10 +135,6 @@
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@ -201,10 +193,6 @@
choosing-strategy: 'default'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@ -268,10 +256,6 @@
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@ -326,10 +310,6 @@
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@ -390,10 +370,6 @@
choosing-strategy: 'gerrit'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@ -451,10 +427,6 @@
choosing-strategy: 'default'
wrappers:
- - timestamps
- - ssh-agent-credentials:
- users:
- - 'jenkins-gerrit-credentials'
- fdio-infra-wrappers:
build-timeout: '{build-timeout}'
@@ -499,4 +471,3 @@
fingerprint: false
only-if-success: true
default-excludes: false
-