From: Vratko Polak Date: Thu, 17 Oct 2019 11:37:21 +0000 (+0000) Subject: Merge "Modify CICN artifacts" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=8a4145918cc52ec371dc2a2480971c3092a7a311;hp=b63f2b05a63354e82b3a698528b138fc6ef49e01;p=ci-management.git Merge "Modify CICN artifacts" --- diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index 399241b1f..3fe840c47 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -168,13 +168,6 @@ project-type: freestyle node: '{os}-us' concurrent: true - archive-artifacts: > - **/build/*.rpm, - **/build/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -227,12 +220,6 @@ project-type: freestyle node: '{os}arm-us' concurrent: true - archive-artifacts: > - **/build/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -285,13 +272,6 @@ project-type: freestyle node: '{os}-us' - archive-artifacts: > - **/build/*.rpm, - **/build/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -379,12 +359,6 @@ project-type: freestyle node: '{os}arm-us' - archive-artifacts: > - **/build/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -485,13 +459,6 @@ project-type: freestyle node: '{os}-us' concurrent: true - archive-artifacts: > - **/build/*.rpm, - **/build/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -551,13 +518,6 @@ project-type: freestyle node: '{os}-us' - archive-artifacts: > - **/build/*.rpm, - **/build/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' diff --git a/jjb/jvpp/jvpp.yaml b/jjb/jvpp/jvpp.yaml index dc8d20974..234d7fbeb 100644 --- a/jjb/jvpp/jvpp.yaml +++ b/jjb/jvpp/jvpp.yaml @@ -97,8 +97,7 @@ - include-raw-jvpp-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - naginator: rerun-unstable-builds: false max-failed-builds: 2 @@ -198,8 +197,7 @@ - include-raw-jvpp-maven-push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn36' + - lf-infra-publish - naginator: rerun-unstable-builds: false max-failed-builds: 1 diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml index 13b1134bc..f1d0cdb1d 100644 --- a/jjb/sweetcomb/sweetcomb.yaml +++ b/jjb/sweetcomb/sweetcomb.yaml @@ -57,13 +57,6 @@ project-type: freestyle node: '{os}-us' concurrent: true - archive-artifacts: > - **/build-root/build-package/*.rpm - **/build-root/build-package/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -120,8 +113,7 @@ !include-raw-escape: - include-raw-sweetcomb-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - naginator: rerun-unstable-builds: false max-failed-builds: 1 @@ -132,13 +124,6 @@ project-type: freestyle node: '{os}-us' - archive-artifacts: > - **/build-root/build-package/*.rpm - **/build-root/build-package/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -195,8 +180,7 @@ !include-raw-escape: - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - naginator: rerun-unstable-builds: false max-failed-builds: 1 @@ -256,8 +240,7 @@ - include-raw-sweetcomb-build.sh - include-raw-sweetcomb-test.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - naginator: rerun-unstable-builds: false max-failed-builds: 1 diff --git a/jjb/udpi/udpi.yaml b/jjb/udpi/udpi.yaml index 3e808aa47..1d910d0f6 100644 --- a/jjb/udpi/udpi.yaml +++ b/jjb/udpi/udpi.yaml @@ -44,13 +44,6 @@ project-type: freestyle node: '{os}-us' concurrent: true - archive-artifacts: > - **/build-root/build-package/*.rpm - **/build-root/build-package/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -113,13 +106,6 @@ project-type: freestyle node: '{os}-us' - archive-artifacts: > - **/build-root/build-package/*.rpm - **/build-root/build-package/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml index 23f1b9385..72a064788 100644 --- a/jjb/vpp/docs.yaml +++ b/jjb/vpp/docs.yaml @@ -9,8 +9,8 @@ project: 'vpp' os: - - ubuntu1604: - repo-os-part: 'ubuntu.xenial.main' + - ubuntu1804: + repo-os-part: 'ubuntu.bionic.main' stream: - master: @@ -38,8 +38,8 @@ project: 'vpp' os: - - ubuntu1604: - repo-os-part: 'ubuntu.xenial.main' + - ubuntu1804: + repo-os-part: 'ubuntu.bionic.main' stream: - master: @@ -53,7 +53,7 @@ name: 'vpp-docs-verify-{stream}' project-type: freestyle - node: ubuntu1604-us + node: ubuntu1804-us concurrent: true allow-empty: 'true' fingerprint: false @@ -73,7 +73,7 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: 'ubuntu1604' + os: 'ubuntu1804' - maven-exec: maven-version: 'mvn33-new' - stream-parameter: @@ -121,7 +121,7 @@ name: 'vpp-docs-merge-{stream}' project-type: freestyle - node: ubuntu1604-us + node: ubuntu1804-us concurrent: false archive-artifacts: '**/build-root/docs/html/*' allow-empty: 'true' @@ -142,7 +142,7 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: 'ubuntu1604' + os: 'ubuntu1804' - maven-exec: maven-version: 'mvn33-new' - stream-parameter: @@ -163,7 +163,7 @@ triggers: - reverse: - jobs: 'vpp-merge-{stream}-ubuntu1604' + jobs: 'vpp-merge-{stream}-ubuntu1804' result: 'success' - gerrit: server-name: 'Primary' @@ -209,7 +209,7 @@ name: 'vpp-sphinx-docs-verify-{stream}' project-type: freestyle - node: ubuntu1604-us + node: ubuntu1804-us concurrent: true allow-empty: 'true' fingerprint: false @@ -228,7 +228,7 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: 'ubuntu1604' + os: 'ubuntu1804' - maven-exec: maven-version: 'mvn33-new' - stream-parameter: @@ -288,7 +288,7 @@ name: 'vpp-sphinx-docs-merge-{stream}' project-type: freestyle - node: ubuntu1604-us + node: ubuntu1804-us concurrent: false archive-artifacts: 'docs/_build/html/*' allow-empty: 'true' @@ -308,7 +308,7 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: 'ubuntu1604' + os: 'ubuntu1804' - maven-exec: maven-version: 'mvn33-new' - stream-parameter: @@ -367,7 +367,7 @@ name: 'vpp-make-test-docs-verify-{stream}' project-type: freestyle - node: ubuntu1604-us + node: ubuntu1804-us concurrent: true allow-empty: 'true' fingerprint: false @@ -386,7 +386,7 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: 'ubuntu1604' + os: 'ubuntu1804' - maven-exec: maven-version: 'mvn33-new' - stream-parameter: @@ -434,7 +434,7 @@ name: 'vpp-make-test-docs-merge-{stream}' project-type: freestyle - node: ubuntu1604-us + node: ubuntu1804-us concurrent: false archive-artifacts: '**/test/doc/build/html/*' allow-empty: 'true' @@ -455,7 +455,7 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: 'ubuntu1604' + os: 'ubuntu1804' - maven-exec: maven-version: 'mvn33-new' - stream-parameter: @@ -477,7 +477,7 @@ triggers: - reverse: - jobs: 'vpp-merge-{stream}-ubuntu1604' + jobs: 'vpp-merge-{stream}-ubuntu1804' result: 'success' - gerrit: server-name: 'Primary' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index fb5af2dcb..2afb5c764 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -64,7 +64,7 @@ - '1908': branch: 'stable/1908' repo-stream-part: 'stable.1908' - os: ubuntu1604 + os: ubuntu1804 - project: name: vpp-perpatch @@ -469,7 +469,7 @@ - os-parameter: os: '{os}' - repo-name-parameter: - repo-name: '{repo-stream-part}.ubuntu.xenial.main' + repo-name: '{repo-stream-part}.ubuntu.bionic.main' scm: - gerrit-trigger-scm: @@ -629,7 +629,7 @@ - gerrit-parameter: branch: '{branch}' - os-parameter: - os: 'ubuntu1604' + os: 'ubuntu1804' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.bionic.main' - stream-parameter: