summaryrefslogtreecommitdiffstats
path: root/jjb/sweetcomb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/sweetcomb')
-rw-r--r--jjb/sweetcomb/sweetcomb.yaml59
1 files changed, 30 insertions, 29 deletions
diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index 920576db9..baf29f878 100644
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -58,6 +58,14 @@
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}'
@@ -69,6 +77,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:
@@ -103,14 +115,6 @@
!include-raw-escape:
- include-raw-sweetcomb-build.sh
publishers:
- - archive:
- artifacts: >
- **/build-root/build-package/*.rpm,
- **/build-root/build-package/*.deb,
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- naginator:
@@ -118,10 +122,6 @@
max-failed-builds: 1
fixed-delay: 90
- publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
-
- job-template:
name: 'sweetcomb-merge-{stream}-{os}'
@@ -134,6 +134,14 @@
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}'
@@ -145,6 +153,10 @@
stream: '{stream}'
- 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:
@@ -179,14 +191,6 @@
!include-raw-escape:
- ../scripts/packagecloud_push.sh
publishers:
- - archive:
- artifacts: >
- **/build-root/build-package/*.rpm,
- **/build-root/build-package/*.deb,
- allow-empty: 'true'
- fingerprint: false
- only-if-success: true
- default-excludes: false
- fdio-infra-shiplogs:
maven-version: 'mvn33-new'
- naginator:
@@ -207,6 +211,12 @@
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}'
@@ -248,18 +258,9 @@
- include-raw-sweetcomb-build.sh
- include-raw-sweetcomb-test.sh
publishers:
- - archive:
- 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
-
- publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'