summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2019-07-25 19:24:09 +0000
committerGerrit Code Review <gerrit@fd.io>2019-07-25 19:24:09 +0000
commitbc7e9e27c556c62e63ae984fc6798644b9d8f25b (patch)
treeb41176066713dd71aa4142b42b71fae73630512e
parent81d1f1f413794e323de1ab9d0daa5fe6168775af (diff)
parent8178205ce28b35102874c2de9f8f5a9d2508ed12 (diff)
Merge "Fix Sweetcomb archive artifact"
-rw-r--r--jjb/sweetcomb/sweetcomb.yaml38
1 files changed, 15 insertions, 23 deletions
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}'