diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/dmm/dmm.yaml | 10 | ||||
| -rw-r--r-- | jjb/hicn/hicn-docs.yaml | 43 | ||||
| -rw-r--r-- | jjb/hicn/hicn.yaml | 82 | ||||
| -rw-r--r-- | jjb/sweetcomb/sweetcomb.yaml | 38 |
4 files changed, 95 insertions, 78 deletions
diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml index 76c1a448b..8cf673bb4 100644 --- a/jjb/dmm/dmm.yaml +++ b/jjb/dmm/dmm.yaml @@ -189,6 +189,8 @@ project-type: freestyle node: '{os}-builder-4c-4g' concurrent: true + archive-artifacts: 'csit/archive/*.*' + latest-only: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -201,6 +203,10 @@ project: 'dmm' - gerrit-parameter: branch: '{branch}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -222,10 +228,6 @@ !include-raw-escape: include-raw-dmm-csit-functional-virl.sh publishers: - - archive-artifacts: - artifacts: 'csit/archive/*.*' - latest-only: false - - robot-report: output-path: 'csit' diff --git a/jjb/hicn/hicn-docs.yaml b/jjb/hicn/hicn-docs.yaml index ea98f6fab..420b97deb 100644 --- a/jjb/hicn/hicn-docs.yaml +++ b/jjb/hicn/hicn-docs.yaml @@ -1,3 +1,4 @@ +--- - project: name: hicn-docs jobs: @@ -23,6 +24,11 @@ project-type: freestyle node: ubuntu1604-us concurrent: true + archive-artifacts: '**/build/lib/doc/html/*' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -41,6 +47,10 @@ maven-version: 'mvn33-new' - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -72,18 +82,12 @@ !include-raw-escape: include-raw-hicn-docs.sh publishers: - - archive: - artifacts: 'build/lib/doc/html/*' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' - - naginator: - rerun-unstable-builds: false - max-failed-builds: 1 - fixed-delay: 90 + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + - naginator: + rerun-unstable-builds: false + max-failed-builds: 1 + fixed-delay: 90 - job-template: name: 'hicn-docs-merge-{stream}' @@ -91,6 +95,11 @@ project-type: freestyle node: ubuntu1604-us concurrent: false + archive-artifacts: '**/build/lib/doc/html/*' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false build-discarder: daysToKeep: '{build-days-to-keep}' @@ -109,6 +118,10 @@ maven-version: 'mvn33-new' - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -156,12 +169,6 @@ !include-raw-escape: include-raw-hicn-docs.sh publishers: - - archive: - artifacts: 'build/lib/doc/html/*' - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml index 3343e24ec..541a0c571 100644 --- a/jjb/hicn/hicn.yaml +++ b/jjb/hicn/hicn.yaml @@ -58,6 +58,7 @@ project-type: freestyle node: '{os}-us' concurrent: true + archive-artifacts: '**/tmp/hicn-failed-unittests/*/* **/core' build-discarder: daysToKeep: '{build-days-to-keep}' @@ -74,6 +75,10 @@ os: '{os}' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.xenial.main' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -133,7 +138,6 @@ publishers: - fdio-infra-shiplogs: maven-version: 'mvn33-new' - archive-artifacts: '/tmp/hicn-failed-unittests/*/* **/core' - naginator: rerun-unstable-builds: true max-failed-builds: 1 @@ -145,6 +149,13 @@ 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}' @@ -163,6 +174,10 @@ 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: @@ -185,14 +200,6 @@ - include-raw-hicn-build.sh publishers: - - archive: - artifacts: > - **/build/*.rpm, - **/build/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -201,6 +208,13 @@ 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}' @@ -223,6 +237,10 @@ 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: @@ -273,14 +291,6 @@ - include-raw-hicn-maven-push.sh publishers: - - archive: - artifacts: > - **/build/*.rpm, - **/build/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: @@ -305,6 +315,13 @@ 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}' @@ -323,6 +340,10 @@ repo-name: '{repo-stream-part}.ubuntu.bionic.main' - stream-parameter: stream: '{stream}' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -353,14 +374,6 @@ - include-raw-hicn-sysrepo-build.sh publishers: - - archive: - artifacts: > - **/build/*.rpm, - **/build/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' @@ -369,6 +382,13 @@ 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}' @@ -391,6 +411,10 @@ stream: 'release' - repo-name-parameter: repo-name: '{repo-stream-part}.ubuntu.bionic.main' + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. scm: - gerrit-trigger-scm: @@ -449,14 +473,6 @@ - include-raw-hicn-maven-push.sh publishers: - - archive: - artifacts: > - **/build/*.rpm, - **/build/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml index 3f58ccda7..803a781f8 100644 --- a/jjb/sweetcomb/sweetcomb.yaml +++ b/jjb/sweetcomb/sweetcomb.yaml @@ -20,7 +20,7 @@ jobs: - 'sweetcomb-verify-{stream}-{os}' - 'sweetcomb-merge-{stream}-{os}' - #- 'sweetcomb-test-{stream}-ubuntu1604' + # - 'sweetcomb-test-{stream}-ubuntu1604' project: 'sweetcomb' os: @@ -54,6 +54,13 @@ 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}' @@ -61,14 +68,6 @@ artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' - archive-artifacts: > - **/build-root/build-package/*.rpm - **/build-root/build-package/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - parameters: - project-parameter: project: '{project}' @@ -130,6 +129,13 @@ 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}' @@ -137,14 +143,6 @@ artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' - archive-artifacts: > - **/build-root/build-package/*.rpm - **/build-root/build-package/*.deb - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - parameters: - project-parameter: project: '{project}' @@ -214,12 +212,6 @@ artifactDaysToKeep: '{build-artifact-days-to-keep}' artifactNumToKeep: '{build-artifact-num-to-keep}' - archive-artifacts: > - allow-empty: 'true' - fingerprint: false - only-if-success: true - default-excludes: false - parameters: - project-parameter: project: '{project}' |