X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fsweetcomb%2Fsweetcomb.yaml;h=2f27442d37bcc7abdc858038a790eb5f18b85e5a;hb=536be0062a160b4595a73ba8d70593b9a0b7eb9e;hp=f1accc67ceece7e57fb4978184326e227b8981fa;hpb=7f85d301a2488deccaa2dd818b1aa062e4b26649;p=ci-management.git

diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index f1accc67c..2f27442d3 100644
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -20,14 +20,12 @@
     jobs:
       - 'sweetcomb-verify-{stream}-{os}'
       - 'sweetcomb-merge-{stream}-{os}'
-      - 'sweetcomb-test-{stream}-{os}'
+      #- 'sweetcomb-test-{stream}-ubuntu1604'
 
     project: 'sweetcomb'
     os:
       - ubuntu1604:
           repo-os-part: 'ubuntu.xenial.main'
-      - ubuntu1804:
-          repo-os-part: 'ubuntu.bionic.main'
       - centos7:
           repo-os-part: 'centos7'
     stream:
@@ -40,6 +38,9 @@
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
+      - vom:
+          branch: 'vom'
+          repo-stream-part: 'vom'
 
 - project:
     name: sweetcomb-view
@@ -60,6 +61,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 +80,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 +118,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 +125,6 @@
           max-failed-builds: 1
           fixed-delay: 90
 
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
 - job-template:
     name: 'sweetcomb-merge-{stream}-{os}'
 
@@ -138,7 +139,7 @@
 
     archive-artifacts: >
         **/build-root/build-package/*.rpm
-        **/build-root/build-package/*.deb,
+        **/build-root/build-package/*.deb
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
@@ -160,7 +161,6 @@
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
 
-
     scm:
       - gerrit-trigger-scm:
           credentials-id: 'jenkins-gerrit-credentials'
@@ -194,14 +194,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:
@@ -210,10 +202,10 @@
           fixed-delay: 90
 
 - job-template:
-    name: 'sweetcomb-test-{stream}-{os}'
+    name: 'sweetcomb-test-{stream}-ubuntu1604'
 
     project-type: freestyle
-    node: '{os}-us'
+    node: 'ubuntu1604-us'
     concurrent: true
 
     build-discarder:
@@ -222,15 +214,21 @@
       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}'
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: '{os}'
+          os: 'ubuntu1604'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.{repo-os-part}'
+          repo-name: '{repo-stream-part}.ubuntu.xenial.main'
       - stream-parameter:
           stream: '{stream}'
 
@@ -263,18 +261,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'