Fix Sweetcomb archive artifact

Moving the archive-artifact macro to the correct location

Change-Id: I89daef8fb6b8ed1309fcb7bd86ed10c5bd66165c
Signed-off-by: Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org>

diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index 3f58ccd..803a781 100644 (file)
--- 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}'