Merge "Modify logs publisher"

diff --combined jjb/hicn/hicn.yaml
index 4a998bf,7fc50ec..399241b
--- 1/jjb/hicn/hicn.yaml
--- 2/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@@ -23,26 -23,6 +23,26 @@@
        - short
        - long
  
 +- project:
 +    name: hicn-arm
 +    jobs:
 +      - 'hicn-arm-verify-{stream}-{os}'
 +      - 'hicn-arm-merge-{stream}-{os}'
 +
 +    project: 'hicn'
 +    os:
 +      - ubuntu1804:
 +          repo-os-part: 'ubuntu-arm.bionic.main'
 +
 +    stream:
 +      - master:
 +          branch: 'master'
 +          repo-stream-part: 'master'
 +
 +    type:
 +      - short
 +      - long
 +
  - project:
      name: hicn-misc
      jobs:
@@@ -156,8 -136,7 +156,7 @@@
            !include-raw-escape: include-raw-hicn-checkstyle.sh
  
      publishers:
-       - fdio-infra-shiplogs:
-           maven-version: 'mvn33-new'
+       - lf-infra-publish
        - naginator:
            rerun-unstable-builds: true
            max-failed-builds: 1
@@@ -220,68 -199,8 +219,67 @@@
            - include-raw-hicn-build.sh
  
      publishers:
-       - fdio-infra-shiplogs:
-           maven-version: 'mvn33-new'
+       - lf-infra-publish
  
 +- job-template:
 +    name: 'hicn-arm-verify-{stream}-{os}'
 +
 +    project-type: freestyle
 +    node: '{os}arm-us'
 +    concurrent: true
 +    archive-artifacts: >
 +      **/build/*.deb
 +    allow-empty: 'true'
 +    fingerprint: false
 +    only-if-success: true
 +    default-excludes: false
 +
 +    build-discarder:
 +      daysToKeep: '{build-days-to-keep}'
 +      numToKeep: 100
 +      artifactDaysToKeep: '{build-artifact-days-to-keep}'
 +      artifactNumToKeep: '{build-artifact-num-to-keep}'
 +
 +    parameters:
 +      - project-parameter:
 +          project: '{project}'
 +      - gerrit-parameter:
 +          branch: '{branch}'
 +      - os-parameter:
 +          os: '{os}'
 +      - repo-name-parameter:
 +          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:
 +          credentials-id: 'jenkins-gerrit-credentials'
 +          refspec: '$GERRIT_REFSPEC'
 +          choosing-strategy: 'gerrit'
 +
 +    wrappers:
 +      - fdio-infra-wrappers:
 +          build-timeout: 120
 +
 +    triggers:
 +      - gerrit-trigger-checkstyle:
 +          name: '{project}'
 +          branch: '{branch}'
 +
 +    builders:
 +      - shell:
 +          !include-raw-escape:
 +          - include-raw-hicn-build.sh
 +
 +    publishers:
 +      - fdio-infra-shiplogs:
 +          maven-version: 'mvn33-new'
 +
  - job-template:
      name: 'hicn-merge-{stream}-{os}'
  
@@@ -370,105 -289,10 +368,104 @@@
            - include-raw-hicn-maven-push.sh
  
      publishers:
-       - fdio-infra-shiplogs:
-           maven-version: 'mvn33-new'
+       - lf-infra-publish
        - naginator:
            rerun-unstable-builds: false
            max-failed-builds: 1
 +          fixed-delay: 90
 +
 +- job-template:
 +    name: 'hicn-arm-merge-{stream}-{os}'
 +
 +    project-type: freestyle
 +    node: '{os}arm-us'
 +    archive-artifacts: >
 +      **/build/*.deb
 +    allow-empty: 'true'
 +    fingerprint: false
 +    only-if-success: true
 +    default-excludes: false
 +
 +    build-discarder:
 +      daysToKeep: '{build-days-to-keep}'
 +      numToKeep: 100
 +      artifactDaysToKeep: '{build-artifact-days-to-keep}'
 +      artifactNumToKeep: '{build-artifact-num-to-keep}'
 +
 +    parameters:
 +      - project-parameter:
 +          project: '{project}'
 +      - gerrit-parameter:
 +          branch: '{branch}'
 +      - os-parameter:
 +          os: '{os}'
 +      - maven-project-parameter:
 +          maven: 'mvn33-new'
 +      - maven-exec:
 +          maven-version: 'mvn33-new'
 +      - stream-parameter:
 +          stream: 'release'
 +      - 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:
 +          credentials-id: 'jenkins-gerrit-credentials'
 +          refspec: ''
 +          choosing-strategy: 'default'
 +
 +    wrappers:
 +      - fdio-infra-wrappers:
 +          build-timeout: '{build-timeout}'
 +
 +    triggers:
 +      - gerrit-trigger-patch-merged:
 +          name: '{project}'
 +          branch: '{branch}'
 +
 +    builders:
 +      - config-file-provider:
 +          files:
 +            - file-id: '.packagecloud'
 +              target: '/root'
 +      - config-file-provider:
 +          files:
 +            - file-id: 'packagecloud_api'
 +              target: '/root'
 +      - maven-target:
 +          maven-version: 'mvn33-new'
 +          goals: '--version'
 +          settings: 'hicn-settings'
 +          settings-type: cfp
 +          global-settings: 'global-settings'
 +          global-settings-type: cfp
 +      - shell:
 +          !include-raw-escape:
 +          - include-raw-hicn-checkstyle.sh
 +      - shell:
 +          !include-raw-escape:
 +          - include-raw-hicn-build.sh
 +      - provide-maven-settings:
 +          settings-file: 'hicn-settings'
 +          global-settings-file: 'global-settings'
 +      - shell:
 +          !include-raw-escape:
 +          - ../scripts/packagecloud_push.sh
 +      - shell:
 +          !include-raw-escape:
 +          - ../scripts/maven_push_functions.sh
 +          - include-raw-hicn-maven-push.sh
 +
 +    publishers:
 +      - fdio-infra-shiplogs:
 +          maven-version: 'mvn33-new'
 +      - naginator:
 +          rerun-unstable-builds: false
 +          max-failed-builds: 1
            fixed-delay: 90
  
  - project:
@@@ -547,8 -371,7 +544,7 @@@
            - include-raw-hicn-sysrepo-build.sh
  
      publishers:
-       - fdio-infra-shiplogs:
-           maven-version: 'mvn33-new'
+       - lf-infra-publish
  
  - job-template:
      name: 'hicn-sysrepo-plugin-merge-{stream}'
@@@ -646,8 -469,7 +642,7 @@@
            - include-raw-hicn-maven-push.sh
  
      publishers:
-       - fdio-infra-shiplogs:
-           maven-version: 'mvn33-new'
+       - lf-infra-publish
        - naginator:
            rerun-unstable-builds: false
            max-failed-builds: 1