From: Vanessa Rene Valderrama Date: Wed, 16 Oct 2019 19:26:38 +0000 (+0000) Subject: Merge "CSIT: unpin wagon version" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=03eee3917a17ed8a549681d4429751a3fba1449c;hp=c27a8c8ad24bf82d76865fe8a5fdfc53ef814cb4;p=ci-management.git Merge "CSIT: unpin wagon version" --- diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml index 7172ee5f9..51aec554d 100644 --- a/jjb/deb_dpdk/deb_dpdk.yaml +++ b/jjb/deb_dpdk/deb_dpdk.yaml @@ -86,8 +86,7 @@ - include-raw-deb_dpdk-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'deb_dpdk-verify-image-{stream}-{os}' @@ -146,8 +145,7 @@ - include-raw-deb_dpdk-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'deb_dpdk-merge-{stream}-{os}' @@ -213,8 +211,7 @@ - include-raw-deb_dpdk-pkg-push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - project: name: deb_dpdk-info diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index 73aca1ef0..f85eafd3e 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -82,8 +82,7 @@ publishers: - email-notification: email-prefix: '[honeycomb]' - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - job-template: name: 'honeycomb-merge-{stream}-{os}' @@ -164,8 +163,7 @@ id: '' unique-version: true deploy-unstable: false - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - job-template: name: 'honeycomb-benchmark-master-{os}' @@ -281,8 +279,7 @@ # yamllint disable-line rule:line-length exclude: 'simple-container,list-in-container,complex-list-in-container' - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - project: name: honeycomb-info diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml index d1d936a32..5380ce98d 100644 --- a/jjb/tldk/tldk.yaml +++ b/jjb/tldk/tldk.yaml @@ -78,8 +78,7 @@ !include-raw-escape: include-raw-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: '{project}-verify-image-{stream}-{os}' @@ -139,8 +138,7 @@ !include-raw-escape: include-raw-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: '{project}-merge-{stream}-{os}' @@ -185,8 +183,7 @@ !include-raw-escape: include-raw-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'tldk-csit-verify-func-{stream}-{os}-virl' @@ -239,9 +236,7 @@ publishers: - robot-report: output-path: '' - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - project: name: tldk-info diff --git a/jjb/trex/trex.yaml b/jjb/trex/trex.yaml index e85b791d6..0d8cea906 100644 --- a/jjb/trex/trex.yaml +++ b/jjb/trex/trex.yaml @@ -62,8 +62,7 @@ !include-raw-escape: include-raw-trex-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'trex-merge-{stream}-{os}' @@ -106,8 +105,7 @@ !include-raw-escape: include-raw-trex-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - project: name: trex-info diff --git a/jjb/udpi/udpi.yaml b/jjb/udpi/udpi.yaml index 2b0251835..3e808aa47 100644 --- a/jjb/udpi/udpi.yaml +++ b/jjb/udpi/udpi.yaml @@ -103,8 +103,7 @@ target: '/root' publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - naginator: rerun-unstable-builds: false max-failed-builds: 1 @@ -170,8 +169,7 @@ target: '/root' publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - naginator: rerun-unstable-builds: false max-failed-builds: 1 diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 46a04feac..fb5af2dcb 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -182,16 +182,7 @@ project-type: freestyle node: '{os}-us' concurrent: true - archive-artifacts: > - **/build-root/*.rpm - **/build-root/*.deb - **/dpdk/*.rpm - **/dpdk/*.deb - **/tmp/vpp-failed-unittests/*/* **/core - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' triggers: - gerrit-trigger-checkstyle: @@ -251,15 +242,6 @@ project-type: freestyle node: '{os}-us' - archive-artifacts: > - **/build-root/*.rpm - **/build-root/*.deb - **/dpdk/*.rpm - **/dpdk/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -334,15 +316,7 @@ project-type: freestyle node: '{os}arm-us' concurrent: true - archive-artifacts: > - **/build-root/*.rpm - **/build-root/*.deb - **/dpdk/*.rpm - **/dpdk/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' build-discarder: daysToKeep: '{build-days-to-keep}' @@ -393,7 +367,6 @@ publishers: - fdio-infra-shiplogs: maven-version: 'mvn36' - archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: false max-failed-builds: 1 @@ -404,15 +377,6 @@ project-type: freestyle node: '{os}arm-m' - archive-artifacts: > - **/build-root/*.rpm - **/build-root/*.deb - **/dpdk/*.rpm - **/dpdk/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -489,6 +453,7 @@ project-type: freestyle node: '{os}-us' concurrent: true + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' build-discarder: daysToKeep: '{build-days-to-keep}' @@ -578,7 +543,6 @@ publishers: - fdio-infra-shiplogs: maven-version: 'mvn36' - archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: true max-failed-builds: 1 @@ -590,15 +554,7 @@ project-type: freestyle node: '{os}-us' concurrent: true - archive-artifacts: > - **/build-root/*.rpm - **/build-root/*.deb - **/dpdk/*.rpm - **/dpdk/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' build-discarder: daysToKeep: '{build-days-to-keep}' @@ -648,7 +604,6 @@ publishers: - fdio-infra-shiplogs: maven-version: 'mvn36' - archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: false max-failed-builds: 2 @@ -660,6 +615,7 @@ project-type: freestyle node: 'ubuntu1804-us' concurrent: true + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' build-discarder: daysToKeep: '{build-days-to-keep}' @@ -705,7 +661,6 @@ publishers: - fdio-infra-shiplogs: maven-version: 'mvn36' - archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: false max-failed-builds: 1 @@ -717,6 +672,7 @@ project-type: freestyle node: 'ubuntu1804-us' concurrent: true + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' build-discarder: daysToKeep: '{build-days-to-keep}' @@ -808,22 +764,12 @@ fixed: true - fdio-infra-shiplogs: maven-version: 'mvn36' - archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - job-template: name: 'vpp-merge-{stream}-{os}' project-type: freestyle node: '{os}-us' - archive-artifacts: > - **/build-root/*.rpm - **/build-root/*.deb - **/dpdk/*.rpm - **/dpdk/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}'