Merge "Revert "Migrate cicn job templates to global-jjb""

diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 4e7acab..2cff11d 100644 (file)
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -21,11 +21,6 @@
           branch: 'cframework/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -52,11 +47,6 @@
           branch: 'cframework/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -105,11 +95,6 @@
           branch: 'ccnxlibs/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -134,11 +119,6 @@
           branch: 'ccnxlibs/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -163,11 +143,6 @@
           branch: 'libicnet/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -192,11 +167,6 @@
           branch: 'sb-forwarder/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -221,11 +191,6 @@
           branch: 'http-server/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -250,11 +215,6 @@
           branch: 'cicn-plugin/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -277,11 +237,6 @@
           branch: 'viper/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -302,11 +257,6 @@
           branch: 'vicn/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -327,12 +277,6 @@
           branch: 'android-sdk/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-      **/*.apk
-
     type:
       - short
       - long
@@ -353,11 +297,6 @@
           branch: 'vicn/master'
           repo-stream-part: 'master'
 
-    archive-artifacts: >
-      **/*.rpm
-      **/*.deb
-      **/*.tar
-
     type:
       - short
       - long
@@ -381,24 +320,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'release'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'release'
 
     scm:
       - gerrit-trigger-scm:
@@ -416,7 +351,6 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -447,7 +381,16 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/longbow/build/*.rpm,
+            **/longbow/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-longbow-verify-{stream}-{os}'
@@ -463,17 +406,11 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: '{stream}'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
       - os-parameter:
-          description: Operating system.
           os: '{os}'
 
     scm:
@@ -492,13 +429,21 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-longbow-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/longbow/build/*.rpm,
+            **/longbow/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-longbow-docs-merge-{stream}'
@@ -514,17 +459,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: '{stream}'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -558,7 +498,6 @@
             notbuilt: true
 
     builders:
-      - lf-infra-pre-build
       - maven-target:
           maven-version: 'mvn33-new'
           goals: '--version'
@@ -574,7 +513,14 @@
           - include-raw-cicn-longbow-docs.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: 'longbow/build/documentation/*.tar'
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-longbow-docs-verify-{stream}'
@@ -590,17 +536,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: '{stream}'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -618,7 +559,6 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - maven-target:
           maven-version: 'mvn33-new'
           goals: '--version'
@@ -634,7 +574,14 @@
           - include-raw-cicn-longbow-docs.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: 'longbow/build/documentation/*.tar'
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libparc-merge-{stream}-{os}'
@@ -649,24 +596,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'release'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'release'
 
     scm:
       - gerrit-trigger-scm:
@@ -690,7 +633,6 @@
           result: 'failure'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -721,7 +663,16 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/libparc/build/*.rpm,
+            **/libparc/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libparc-verify-{stream}-{os}'
@@ -737,24 +688,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
-      - maven-project-parameter:
-          maven: 'mvn33-new'
-      - maven-exec:
-          maven-version: 'mvn33-new'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - 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:
@@ -772,13 +711,21 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-libparc-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/libparc/build/*.rpm,
+            **/libparc/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libparc-docs-merge-{stream}'
@@ -794,19 +741,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
-      - maven-project-parameter:
-          maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -840,7 +780,6 @@
             notbuilt: true
 
     builders:
-      - lf-infra-pre-build
       - maven-target:
           maven-version: 'mvn33-new'
           goals: '--version'
@@ -856,7 +795,14 @@
           - include-raw-cicn-libparc-docs.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: 'libparc/build/documentation/*.tar'
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libparc-docs-verify-{stream}'
@@ -872,17 +818,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -900,7 +841,6 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - maven-target:
           maven-version: 'mvn33-new'
           goals: '--version'
@@ -916,7 +856,14 @@
           - include-raw-cicn-libparc-docs.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: 'libparc/build/documentation/*.tar'
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 
 - job-template:
@@ -932,24 +879,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'master'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -970,7 +913,6 @@
           result: 'failure'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -1001,7 +943,16 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/libccnx-common/build/*.rpm,
+            **/libccnx-common/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libccnx-common-verify-{stream}-{os}'
@@ -1017,18 +968,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1046,13 +991,21 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-libccnx-common-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/libccnx-common/build/*.rpm,
+            **/libccnx-common/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libccnx-transport-rta-merge-{stream}-{os}'
@@ -1067,24 +1020,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'master'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1105,7 +1054,6 @@
           result: 'failure'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -1136,7 +1084,16 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/libccnx-transport-rta/build/*.rpm,
+            **/libccnx-transport-rta/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libccnx-transport-rta-verify-{stream}-{os}'
@@ -1152,18 +1109,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1181,13 +1132,22 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-libccnx-transport-rta-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          # yamllint disable-line rule:line-length
+          artifacts: >
+            **/libccnx-transport-rta/build/*.rpm,
+            **/libccnx-transport-rta/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libccnx-portal-merge-{stream}-{os}'
@@ -1202,24 +1162,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'master'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1240,7 +1196,6 @@
           result: 'failure'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -1271,7 +1226,16 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/libccnx-portal/build/*.rpm,
+            **/libccnx-portal/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libccnx-portal-verify-{stream}-{os}'
@@ -1287,18 +1251,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1316,13 +1274,21 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-libccnx-portal-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/libccnx-portal/build/*.rpm,
+            **/libccnx-portal/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libicnet-merge-{stream}-{os}'
@@ -1337,24 +1303,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'master'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1375,7 +1337,6 @@
           result: 'failure'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -1406,7 +1367,16 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/build/*.rpm,
+            **/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-libicnet-verify-{stream}-{os}'
@@ -1422,18 +1392,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1451,13 +1415,21 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-libicnet-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/build/*.rpm,
+            **/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-metis-merge-{stream}-{os}'
@@ -1472,24 +1444,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'master'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1510,7 +1478,6 @@
           result: 'failure'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -1541,7 +1508,16 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/metis/build/*.rpm,
+            **/metis/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-metis-verify-{stream}-{os}'
@@ -1557,18 +1533,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1586,13 +1556,21 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-metis-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/metis/build/*.rpm,
+            **/metis/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-http-server-merge-{stream}-{os}'
@@ -1607,24 +1585,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'master'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1645,7 +1619,6 @@
           result: 'failure'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -1676,7 +1649,16 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/build/*.rpm,
+            **/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-http-server-verify-{stream}-{os}'
@@ -1692,18 +1674,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1721,13 +1697,21 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-http-server-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/build/*.rpm,
+            **/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-vpp-plugin-merge-{stream}-{os}'
@@ -1742,24 +1726,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'master'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1777,7 +1757,6 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -1808,7 +1787,16 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/cicn-plugin/build/*.rpm,
+            **/cicn-plugin/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-vpp-plugin-verify-{stream}-{os}'
@@ -1876,24 +1864,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'msater'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -1914,7 +1898,6 @@
           result: 'failure'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -1945,7 +1928,18 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/build/*.rpm,
+            **/build/*.deb,
+            **/libdash/build/*.rpm,
+            **/libdash/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-viper-verify-{stream}-{os}'
@@ -1961,18 +1955,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -1990,13 +1978,23 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-viper-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/build/*.rpm,
+            **/build/*.deb,
+            **/libdash/build/*.rpm,
+            **/libdash/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-radio-emulators-merge-{stream}-{os}'
@@ -2011,24 +2009,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'master'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -2046,7 +2040,6 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -2077,7 +2070,19 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          # yamllint disable-line rule:line-length
+          artifacts: >
+            **/emu-radio/build/*.rpm,
+            **/emu-radio/build/*.deb,
+            **/emu-radio/ns3-packages/*.rpm,
+            **/emu-radio/ns3-packages/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-radio-emulators-verify-{stream}-{os}'
@@ -2093,18 +2098,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -2122,13 +2121,25 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-radio-emulators-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          # yamllint disable-line rule:line-length
+          artifacts: >
+            **/emu-radio/build/*.rpm,
+            **/emu-radio/build/*.deb,
+            **/emu-radio/ns3-packages/*.rpm,
+            **/emu-radio/ns3-packages/*.deb
+
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-android-sdk-merge-{stream}-{os}'
@@ -2143,24 +2154,18 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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:
@@ -2178,13 +2183,23 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-android-sdk-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/IGetAndroid/app/build/outputs/apk/release/*.apk,
+            **/MetisForwarderAndroid/app/build/outputs/apk/release/*.apk,
+            **/HttpServer/app/build/outputs/apk/release/*.apk,
+            **/build_armv7-a/viper/viper-armv7//build/outputs/apk/*.apk
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-android-sdk-verify-{stream}-{os}'
@@ -2200,18 +2215,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -2229,13 +2238,23 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-android-sdk-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          # yamllint disable-line rule:line-length
+          artifacts: >
+            **/iGetAndroid/app/build/outputs/apk/*.apk,
+            **/MetisForwarder/app/build/outputs/apk/*.apk,
+            **/build/viper/viper-armv7//build/outputs/apk/*.apk
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-vicn-merge-{stream}-{os}'
@@ -2250,24 +2269,20 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: 'master'
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
+      - os-parameter:
+          os: '{os}'
       - maven-project-parameter:
           maven: 'mvn33-new'
       - maven-exec:
           maven-version: 'mvn33-new'
-      - os-parameter:
-          description: Operating system.
-          os: '{os}'
       - 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.
+      - stream-parameter:
+          stream: 'master'
 
     scm:
       - gerrit-trigger-scm:
@@ -2285,7 +2300,6 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -2316,7 +2330,16 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/build/*.rpm,
+            **/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'
 
 - job-template:
     name: 'cicn-vicn-verify-{stream}-{os}'
@@ -2332,18 +2355,12 @@
       artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-      - lf-infra-parameters:
+      - project-parameter:
           project: '{project}'
-          stream: ''
+      - gerrit-parameter:
           branch: '{branch}'
-          lftools-version: '{lftools-version}'
       - os-parameter:
-          description: Operating system.
           os: '{os}'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -2361,10 +2378,18 @@
           branch: '{branch}'
 
     builders:
-      - lf-infra-pre-build
       - shell:
           !include-raw-escape:
           - include-raw-cicn-vicn-build.sh
 
     publishers:
-      - lf-infra-publish
+      - archive:
+          artifacts: >
+            **/build/*.rpm,
+            **/build/*.deb
+          allow-empty: 'true'
+          fingerprint: false
+          only-if-success: true
+          default-excludes: false
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn33-new'

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 5415596..ea8bd76 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -18,5 +18,3 @@
 
     # fd.io branch defaults
     branch: master
-
-    archive-artifacts: ''