summaryrefslogtreecommitdiffstats
path: root/jjb/sweetcomb
diff options
context:
space:
mode:
authorVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2019-06-04 11:44:20 -0500
committerVanessa Rene Valderrama <vvalderrama@linuxfoundation.org>2019-06-04 11:44:20 -0500
commitc160a325b24d8ca6f5881071a71005b1f454f043 (patch)
tree64129624b692a7e4e32ce623e0327604dba3c86c /jjb/sweetcomb
parentdfd6983e9ff0d3032c0e5897adaaec14716ebdb9 (diff)
Modify Sweetcomb jobs to archive to the logs server
Modified the jobs to archive to the logs server and removed the duplicate publisher lines. Change-Id: Idc058725ae6e8bdfcc6754b5049078ffad5168b0 Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>
Diffstat (limited to 'jjb/sweetcomb')
-rw-r--r--jjb/sweetcomb/sweetcomb.yaml48
1 files changed, 18 insertions, 30 deletions
diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index 5b67481aa..9be3f0520 100644
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -60,6 +60,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}'
@@ -71,6 +79,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:
@@ -105,14 +117,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:
@@ -120,10 +124,6 @@
max-failed-builds: 1
fixed-delay: 90
- publishers:
- - fdio-infra-shiplogs:
- maven-version: 'mvn33-new'
-
- job-template:
name: 'sweetcomb-merge-{stream}-{os}'
@@ -160,7 +160,6 @@
default: '{archive-artifacts}'
description: Artifacts to archive to the logs server.
-
scm:
- gerrit-trigger-scm:
credentials-id: 'jenkins-gerrit-credentials'
@@ -194,14 +193,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:
@@ -222,6 +213,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}'
@@ -263,18 +260,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'