X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fcicn%2Fcicn.yaml;h=b941791f4f4c488523752a4b7c515718e4834221;hb=29be786d3165364f61fadadf0fba430c2f377018;hp=2e8f5afa0c9a089102f27dc9a3e5c22cb071a287;hpb=71b3c6b5d162117a9e4294c850adb6c3df6c49ae;p=ci-management.git diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml index 2e8f5afa0..b941791f4 100644 --- a/jjb/cicn/cicn.yaml +++ b/jjb/cicn/cicn.yaml @@ -24,8 +24,8 @@ jobs: - 'cicn-libparc-verify-{stream}-{os}' - 'cicn-libparc-merge-{stream}-{os}' - # - 'cicn-libparc-docs-verify-{stream}' - # - 'cicn-libparc-docs-merge-{stream}' + - 'cicn-libparc-docs-verify-{stream}' + - 'cicn-libparc-docs-merge-{stream}' project: 'cicn' os: - ubuntu1604: @@ -269,7 +269,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -306,6 +306,14 @@ - timed: '@daily' builders: + - config-file-provider: + files: + - file-id: '.packagecloud' + target: '/home/jenkins/.packagecloud' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/home/jenkins/packagecloud_api' - maven-target: maven-version: 'mvn33-new' goals: '--version' @@ -323,6 +331,10 @@ !include-raw-escape: - ../scripts/maven_push_functions.sh - include-raw-cicn-maven-push.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh + publishers: - archive: artifacts: 'longbow/build/*.rpm,longbow/build/*.deb' @@ -340,7 +352,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -391,7 +403,7 @@ node: ubuntu1604-basebuild-8c-32g concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -454,7 +466,7 @@ - include-raw-cicn-longbow-docs.sh publishers: - archive: - artifacts: 'build/documentation/*.tar' + artifacts: 'longbow/build/documentation/*.tar' allow-empty: 'true' fingerprint: false only-if-success: true @@ -469,7 +481,7 @@ node: ubuntu1604-basebuild-8c-32g concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -516,7 +528,7 @@ - include-raw-cicn-longbow-docs.sh publishers: - archive: - artifacts: 'build/documentation/*.tar' + artifacts: 'longbow/build/documentation/*.tar' allow-empty: 'true' fingerprint: false only-if-success: true @@ -530,7 +542,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -561,6 +573,9 @@ build-timeout: '{build-timeout}' triggers: + - reverse: + jobs: 'cicn-longbow-merge-{stream}-ubuntu1604' + result: 'success' - gerrit-trigger-patch-merged: name: '{project}' branch: '{branch}' @@ -603,7 +618,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -647,13 +662,154 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' +- job-template: + name: 'cicn-libparc-docs-merge-{stream}' + + project-type: freestyle + node: ubuntu1604-basebuild-8c-32g + concurrent: true + + build-discarder: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - reverse: + jobs: 'cicn-libparc-merge-{stream}-ubuntu1604' + result: 'success' + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'run-docs' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + + builders: + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - provide-maven-settings: + settings-file: 'cicn-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - include-raw-cicn-libparc-docs.sh + publishers: + - archive: + artifacts: 'libparc/build/documentation/*.tar' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'cicn-libparc-docs-verify-{stream}' + + project-type: freestyle + node: ubuntu1604-basebuild-8c-32g + concurrent: true + + build-discarder: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' + + 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-submitted: + name: '{project}' + branch: '{branch}' + + builders: + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - provide-maven-settings: + settings-file: 'cicn-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - include-raw-cicn-libparc-docs.sh + publishers: + - archive: + artifacts: 'libparc/build/documentation/*.tar' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + + - job-template: name: 'cicn-libccnx-common-merge-{stream}-{os}' project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -726,7 +882,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -776,7 +932,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -849,7 +1005,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -899,7 +1055,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -972,7 +1128,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1022,7 +1178,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1095,7 +1251,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1145,7 +1301,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1218,7 +1374,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1268,7 +1424,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1341,7 +1497,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1391,7 +1547,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1462,7 +1618,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1512,7 +1668,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1585,7 +1741,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1635,7 +1791,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1706,7 +1862,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1756,7 +1912,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1798,7 +1954,7 @@ - include-raw-cicn-android-sdk-build.sh publishers: - archive: - artifacts: 'iGetAndroid/app/build/outputs/apk/*.apk,MetisForwarder/app/build/outputs/apk/*.apk,build/viper/viper-armv7//build/outputs/apk/*.apk' + artifacts: 'IGetAndroid/app/build/outputs/apk/release/*.apk,MetisForwarderAndroid/app/build/outputs/apk/release/*.apk,HttpServer/app/build/outputs/apk/release/*.apk,build_armv7-a/viper/viper-armv7//build/outputs/apk/*.apk' allow-empty: 'true' fingerprint: false only-if-success: true @@ -1813,7 +1969,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1863,7 +2019,7 @@ project-type: freestyle node: '{os}-basebuild-4c-4g' - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}' @@ -1934,7 +2090,7 @@ node: '{os}-basebuild-4c-4g' concurrent: true - logrotate: + build-discarder: daysToKeep: '{build-days-to-keep}' numToKeep: '{build-num-to-keep}' artifactDaysToKeep: '{build-artifact-days-to-keep}'