diff options
| -rw-r--r-- | jjb/cicn/cicn.yaml | 96 | ||||
| -rw-r--r-- | jjb/cicn/include-raw-cicn-libparc-docs.sh | 2 | ||||
| -rw-r--r-- | jjb/deb_dpdk/deb_dpdk.yaml | 9 | ||||
| -rw-r--r-- | jjb/dmm/dmm.yaml | 13 | ||||
| -rw-r--r-- | jjb/hicn/hicn-docs.yaml | 6 | ||||
| -rw-r--r-- | jjb/hicn/hicn.yaml | 180 | ||||
| -rw-r--r-- | jjb/hicn/include-raw-hicn-docs.sh | 2 | ||||
| -rw-r--r-- | jjb/puppet-fdio/puppet-fdio.yaml | 3 |
8 files changed, 218 insertions, 93 deletions
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml index a98d18aac..bba3273ce 100644 --- a/jjb/cicn/cicn.yaml +++ b/jjb/cicn/cicn.yaml @@ -411,8 +411,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-longbow-verify-{stream}-{os}' @@ -467,8 +466,7 @@ - include-raw-cicn-longbow-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-longbow-docs-merge-{stream}' @@ -547,8 +545,7 @@ - include-raw-cicn-longbow-docs.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-longbow-docs-verify-{stream}' @@ -611,8 +608,7 @@ - include-raw-cicn-longbow-docs.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libparc-merge-{stream}-{os}' @@ -705,8 +701,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libparc-verify-{stream}-{os}' @@ -761,8 +756,7 @@ - include-raw-cicn-libparc-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libparc-docs-merge-{stream}' @@ -841,8 +835,7 @@ - include-raw-cicn-libparc-docs.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libparc-docs-verify-{stream}' @@ -905,8 +898,7 @@ - include-raw-cicn-libparc-docs.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-arm64-libparc-merge-{stream}-{os}' @@ -993,8 +985,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-arm64-libparc-verify-{stream}-{os}' @@ -1049,8 +1040,7 @@ - include-raw-cicn-libparc-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libccnx-common-merge-{stream}-{os}' @@ -1140,8 +1130,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libccnx-common-verify-{stream}-{os}' @@ -1196,8 +1185,7 @@ - include-raw-cicn-libccnx-common-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libccnx-transport-rta-merge-{stream}-{os}' @@ -1287,8 +1275,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libccnx-transport-rta-verify-{stream}-{os}' @@ -1343,8 +1330,7 @@ - include-raw-cicn-libccnx-transport-rta-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libccnx-portal-merge-{stream}-{os}' @@ -1434,8 +1420,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libccnx-portal-verify-{stream}-{os}' @@ -1490,8 +1475,7 @@ - include-raw-cicn-libccnx-portal-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libicnet-merge-{stream}-{os}' @@ -1581,8 +1565,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-libicnet-verify-{stream}-{os}' @@ -1637,8 +1620,7 @@ - include-raw-cicn-libicnet-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-metis-merge-{stream}-{os}' @@ -1728,8 +1710,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-metis-verify-{stream}-{os}' @@ -1784,8 +1765,7 @@ - include-raw-cicn-metis-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-http-server-merge-{stream}-{os}' @@ -1875,8 +1855,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-http-server-verify-{stream}-{os}' @@ -1931,8 +1910,7 @@ - include-raw-cicn-http-server-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-vpp-plugin-merge-{stream}-{os}' @@ -2019,8 +1997,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-vpp-plugin-verify-{stream}-{os}' @@ -2075,8 +2052,7 @@ - include-raw-cicn-vpp-plugin-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-viper-merge-{stream}-{os}' @@ -2168,8 +2144,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-viper-verify-{stream}-{os}' @@ -2226,8 +2201,7 @@ - include-raw-cicn-viper-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-radio-emulators-merge-{stream}-{os}' @@ -2316,8 +2290,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-radio-emulators-verify-{stream}-{os}' @@ -2374,8 +2347,7 @@ - include-raw-cicn-radio-emulators-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-android-sdk-merge-{stream}-{os}' @@ -2437,8 +2409,7 @@ - include-raw-cicn-android-sdk-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-android-sdk-verify-{stream}-{os}' @@ -2494,8 +2465,7 @@ - include-raw-cicn-android-sdk-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-vicn-merge-{stream}-{os}' @@ -2582,8 +2552,7 @@ - ../scripts/packagecloud_push.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'cicn-vicn-verify-{stream}-{os}' @@ -2638,8 +2607,7 @@ - include-raw-cicn-vicn-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - project: name: cicn-info diff --git a/jjb/cicn/include-raw-cicn-libparc-docs.sh b/jjb/cicn/include-raw-cicn-libparc-docs.sh index b669af071..cb4d698e1 100644 --- a/jjb/cicn/include-raw-cicn-libparc-docs.sh +++ b/jjb/cicn/include-raw-cicn-libparc-docs.sh @@ -57,7 +57,7 @@ if [[ ${JOB_NAME} == *merge* ]]; then <extension> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.9</version> + <version>3.3.3</version> </extension> </extensions> </build> 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/dmm/dmm.yaml b/jjb/dmm/dmm.yaml index 8cf673bb4..274f6a441 100644 --- a/jjb/dmm/dmm.yaml +++ b/jjb/dmm/dmm.yaml @@ -94,8 +94,7 @@ !include-raw-escape: include-raw-dmm-test-checkstyle.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'dmm-verify-{stream}-{os}' @@ -138,8 +137,7 @@ !include-raw-escape: include-raw-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'dmm-merge-{stream}-{os}' @@ -180,8 +178,7 @@ !include-raw-escape: include-raw-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'dmm-csit-verify-func-{stream}-{os}-virl' @@ -230,9 +227,7 @@ publishers: - robot-report: output-path: 'csit' - - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - project: name: dmm-info diff --git a/jjb/hicn/hicn-docs.yaml b/jjb/hicn/hicn-docs.yaml index 420b97deb..efd15f614 100644 --- a/jjb/hicn/hicn-docs.yaml +++ b/jjb/hicn/hicn-docs.yaml @@ -82,8 +82,7 @@ !include-raw-escape: include-raw-hicn-docs.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - naginator: rerun-unstable-builds: false max-failed-builds: 1 @@ -169,8 +168,7 @@ !include-raw-escape: include-raw-hicn-docs.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/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index 541a0c571..399241b1f 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -24,6 +24,26 @@ - long - project: + name: hicn-arm + jobs: + - 'hicn-arm-verify-{stream}-{os}' + - 'hicn-arm-merge-{stream}-{os}' + + project: 'hicn' + os: + - ubuntu1804: + repo-os-part: 'ubuntu-arm.bionic.main' + + stream: + - master: + branch: 'master' + repo-stream-part: 'master' + + type: + - short + - long + +- project: name: hicn-misc jobs: - 'hicn-checkstyle-verify-{stream}' @@ -136,8 +156,7 @@ !include-raw-escape: include-raw-hicn-checkstyle.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - naginator: rerun-unstable-builds: true max-failed-builds: 1 @@ -200,6 +219,64 @@ - include-raw-hicn-build.sh publishers: + - lf-infra-publish + +- job-template: + name: 'hicn-arm-verify-{stream}-{os}' + + 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}' + numToKeep: 100 + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' + - stream-parameter: + stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: 120 + + triggers: + - gerrit-trigger-checkstyle: + name: '{project}' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: + - include-raw-hicn-build.sh + + publishers: - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -291,6 +368,99 @@ - include-raw-hicn-maven-push.sh publishers: + - lf-infra-publish + - naginator: + rerun-unstable-builds: false + max-failed-builds: 1 + fixed-delay: 90 + +- job-template: + name: 'hicn-arm-merge-{stream}-{os}' + + 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}' + numToKeep: 100 + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + - maven-project-parameter: + maven: 'mvn33-new' + - maven-exec: + maven-version: 'mvn33-new' + - stream-parameter: + stream: 'release' + - repo-name-parameter: + repo-name: '{repo-stream-part}.{repo-os-part}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-merged: + name: '{project}' + branch: '{branch}' + + builders: + - config-file-provider: + files: + - file-id: '.packagecloud' + target: '/root' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/root' + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'hicn-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - shell: + !include-raw-escape: + - include-raw-hicn-checkstyle.sh + - shell: + !include-raw-escape: + - include-raw-hicn-build.sh + - provide-maven-settings: + settings-file: 'hicn-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh + - shell: + !include-raw-escape: + - ../scripts/maven_push_functions.sh + - include-raw-hicn-maven-push.sh + + publishers: - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: @@ -374,8 +544,7 @@ - include-raw-hicn-sysrepo-build.sh publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - job-template: name: 'hicn-sysrepo-plugin-merge-{stream}' @@ -473,8 +642,7 @@ - include-raw-hicn-maven-push.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/hicn/include-raw-hicn-docs.sh b/jjb/hicn/include-raw-hicn-docs.sh index 1bb4f3019..6aa95f2b1 100644 --- a/jjb/hicn/include-raw-hicn-docs.sh +++ b/jjb/hicn/include-raw-hicn-docs.sh @@ -55,7 +55,7 @@ if [[ ${JOB_NAME} == *merge* ]]; then <extension> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-webdav-jackrabbit</artifactId> - <version>2.9</version> + <version>3.3.3</version> </extension> </extensions> </build> diff --git a/jjb/puppet-fdio/puppet-fdio.yaml b/jjb/puppet-fdio/puppet-fdio.yaml index abd54c770..4d705aebb 100644 --- a/jjb/puppet-fdio/puppet-fdio.yaml +++ b/jjb/puppet-fdio/puppet-fdio.yaml @@ -118,8 +118,7 @@ ./scripts/ci-beaker.sh {os} publishers: - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - lf-infra-publish - project: name: puppet-fdio-info |