diff options
| -rw-r--r-- | jjb/ci-management/ci-management-jobs.yaml | 30 | ||||
| -rw-r--r-- | jjb/csit/csit-vpp-honeycomb.yaml | 5 | ||||
| -rw-r--r-- | jjb/csit/csit-vpp-pylint.yaml | 5 | ||||
| -rw-r--r-- | jjb/csit/csit.yaml | 20 | ||||
| -rw-r--r-- | jjb/deb_dpdk/deb_dpdk.yaml | 9 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 5 | ||||
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 6 | ||||
| -rw-r--r-- | jjb/nsh_sfc/nsh_sfc.yaml | 20 | ||||
| -rw-r--r-- | jjb/tldk/tldk.yaml | 9 | ||||
| -rw-r--r-- | jjb/vpp/vpp-lite.yaml | 17 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 29 |
11 files changed, 27 insertions, 128 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml index 559a739b9..ddef5ee9d 100644 --- a/jjb/ci-management/ci-management-jobs.yaml +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -31,9 +31,8 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-submitted: @@ -72,9 +71,8 @@ choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-merged: @@ -105,9 +103,8 @@ commit: '$ZUUL_COMMIT' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' builders: - shell: @@ -132,9 +129,8 @@ commit: 'origin/$ZUUL_BRANCH' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' builders: - shell: @@ -162,9 +158,8 @@ commit: '$ZUUL_COMMIT' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' builders: - shell: @@ -189,9 +184,8 @@ commit: 'origin/$ZUUL_BRANCH' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' builders: - shell: diff --git a/jjb/csit/csit-vpp-honeycomb.yaml b/jjb/csit/csit-vpp-honeycomb.yaml index 01235dfb3..81589ee24 100644 --- a/jjb/csit/csit-vpp-honeycomb.yaml +++ b/jjb/csit/csit-vpp-honeycomb.yaml @@ -34,9 +34,8 @@ branch: '{branch}' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - build-result: diff --git a/jjb/csit/csit-vpp-pylint.yaml b/jjb/csit/csit-vpp-pylint.yaml index 03de48d4f..0d3068945 100644 --- a/jjb/csit/csit-vpp-pylint.yaml +++ b/jjb/csit/csit-vpp-pylint.yaml @@ -40,9 +40,8 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - gerrit-trigger-patch-submitted: diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 0abd0cc59..7ddc89846 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -57,10 +57,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -109,10 +105,6 @@ choosing-strategy: 'gerrit' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: 1400 @@ -294,10 +286,6 @@ branch: '{branch}' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '480' @@ -352,10 +340,6 @@ branch: '{branch}' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: 480 @@ -403,10 +387,6 @@ branch: '{branch}' wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '1440' diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml index 8bf820482..3283aeb34 100644 --- a/jjb/deb_dpdk/deb_dpdk.yaml +++ b/jjb/deb_dpdk/deb_dpdk.yaml @@ -49,9 +49,6 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -95,9 +92,6 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -153,9 +147,6 @@ choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 1745da037..b5b0e1f14 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -112,6 +112,10 @@ timeout: '{build-timeout}' timeout-var: 'BUILD_TIMEOUT' fail: true + - timestamps + - ssh-agent-credentials: + users: + - 'jenkins-gerrit-credentials' - jclouds: single-use: True @@ -250,4 +254,3 @@ variable: 'GLOBAL_SETTINGS_FILE' - file-id: '{settings-file}' variable: 'SETTINGS_FILE' - diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index bf037d58f..8a5011332 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -52,9 +52,6 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -108,9 +105,6 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index 10991c770..339f613ac 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -54,9 +54,6 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -120,9 +117,6 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -198,9 +192,6 @@ choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -256,9 +247,6 @@ choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -315,9 +303,6 @@ choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -371,9 +356,6 @@ choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -411,5 +393,3 @@ global-settings-file: 'global-settings' - shell: !include-raw-escape: include-raw-nsh_sfc-docs.sh - - diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml index 83cfbf4af..f0ad3fbc4 100644 --- a/jjb/tldk/tldk.yaml +++ b/jjb/tldk/tldk.yaml @@ -42,9 +42,6 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -85,9 +82,6 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -140,9 +134,6 @@ choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' 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 - |