X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhicn%2Fhicn.yaml;h=c1da8dcfc5b373aaa1b6f56b23200647c706534d;hb=cfc259ff22813e081ed2699c9ae00c8016b43d66;hp=3343e24ec40346985d847ff26a670cf0c0aee833;hpb=b95490b414522559e102f0aa1b4ef7572c610165;p=ci-management.git

diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 3343e24ec..c1da8dcfc 100644
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -1,8 +1,33 @@
 ---
 - project:
-    name: hicn
+    name: hicn-verify
     jobs:
       - 'hicn-verify-{stream}-{os}'
+
+    project: 'hicn'
+    os:
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
+      - centos7:
+          repo-os-part: 'centos7'
+
+    stream:
+      - master:
+          branch: 'master'
+          repo-stream-part: 'master'
+      - lightng:
+          branch: 'hicn-light-ng'
+          repo-stream-part: 'hicn-light-ng'
+
+    type:
+      - short
+      - long
+
+- project:
+    name: hicn-merge
+    jobs:
       - 'hicn-merge-{stream}-{os}'
 
     project: 'hicn'
@@ -23,6 +48,47 @@
       - short
       - long
 
+- project:
+    name: hicn-arm-verify
+    jobs:
+      - 'hicn-arm-verify-{stream}-{os}'
+
+    project: 'hicn'
+    os:
+      - ubuntu1804:
+          repo-os-part: 'ubuntu-arm.bionic.main'
+
+    stream:
+      - master:
+          branch: 'master'
+          repo-stream-part: 'master'
+      - lightng:
+          branch: 'hicn-light-ng'
+          repo-stream-part: 'hicn-light-ng'
+
+    type:
+      - short
+      - long
+
+- project:
+    name: hicn-arm-merge
+    jobs:
+      - '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:
@@ -32,19 +98,54 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-    os: ubuntu1604
+      - lightng:
+          branch: 'hicn-light-ng'
+          repo-stream-part: 'hicn-light-ng'
+    os: ubuntu1804
 
 - project:
-    name: hicn-sysrepo
+    name: hicn-extras
     jobs:
-      - 'hicn-sysrepo-plugin-verify-{stream}'
-      - 'hicn-sysrepo-plugin-merge-{stream}'
+      - 'hicn-extras-verify-{stream}-{os}'
+      - 'hicn-extras-build-{stream}-{os}'
     project: 'hicn'
+    os:
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
+      - centos7:
+          repo-os-part: 'centos7'
+
     stream:
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-    os: ubuntu1804
+
+    type:
+      - short
+      - long
+
+- project:
+    name: hicn-extras-arm
+    jobs:
+      - 'hicn-extras-arm-verify-{stream}-{os}'
+      - 'hicn-extras-arm-build-{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-view
@@ -58,6 +159,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
+    archive-artifacts: '**/tmp/hicn-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -74,6 +176,10 @@
           os: '{os}'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: '{archive-artifacts}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - gerrit-trigger-scm:
@@ -132,8 +238,7 @@
 
     publishers:
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-          archive-artifacts: '/tmp/hicn-failed-unittests/*/* **/core'
+          maven-version: 'mvn36'
       - naginator:
           rerun-unstable-builds: true
           max-failed-builds: 1
@@ -163,6 +268,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:
@@ -185,16 +294,69 @@
           - include-raw-hicn-build.sh
 
     publishers:
-      - 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'
+          maven-version: 'mvn36'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 2
+          fixed-delay: 90
+
+- job-template:
+    name: 'hicn-arm-verify-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}arm-us'
+    concurrent: true
+
+    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: 'mvn36'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
 
 - job-template:
     name: 'hicn-merge-{stream}-{os}'
@@ -223,6 +385,98 @@
           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/.packagecloud'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/root/packagecloud_api'
+      - 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: 'mvn36'
+      - 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'
+
+    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:
@@ -273,16 +527,8 @@
           - include-raw-hicn-maven-push.sh
 
     publishers:
-      - 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'
+          maven-version: 'mvn36'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -295,12 +541,12 @@
     mvn-settings: hicn-settings
     mvn-version: 'mvn33-new'
     branch: master
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-builder-4c-4g
     jobs:
       - gerrit-maven-sonar
 
 - job-template:
-    name: 'hicn-sysrepo-plugin-verify-{stream}'
+    name: 'hicn-extras-verify-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
@@ -320,9 +566,13 @@
       - os-parameter:
           os: '{os}'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+          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:
@@ -339,7 +589,7 @@
           server-name: 'Primary'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'verify_sysrepo'
+                comment-contains-value: 'verify-extras'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -350,22 +600,18 @@
     builders:
       - shell:
           !include-raw-escape:
-          - include-raw-hicn-sysrepo-build.sh
+          - include-raw-hicn-extras-build.sh
 
     publishers:
-      - 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'
+          maven-version: 'mvn36'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 2
+          fixed-delay: 90
 
 - job-template:
-    name: 'hicn-sysrepo-plugin-merge-{stream}'
+    name: 'hicn-extras-build-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
@@ -390,7 +636,11 @@
       - stream-parameter:
           stream: 'release'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+          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:
@@ -407,7 +657,7 @@
           server-name: 'Primary'
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'merge_sysrepo'
+                comment-contains-value: 'build-extras'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -419,11 +669,11 @@
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
-              target: '/root'
+              target: '/root/.packagecloud'
       - config-file-provider:
           files:
             - file-id: 'packagecloud_api'
-              target: '/root'
+              target: '/root/packagecloud_api'
       - maven-target:
           maven-version: 'mvn33-new'
           goals: '--version'
@@ -433,10 +683,164 @@
           global-settings-type: cfp
       - shell:
           !include-raw-escape:
-          - include-raw-hicn-checkstyle.sh
+          - include-raw-hicn-extras-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: 'mvn36'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
+
+- job-template:
+    name: 'hicn-extras-arm-verify-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}arm-us'
+
+    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: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'verify-extras'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+
+          builders:
+            - shell:
+                !include-raw-escape:
+                - include-raw-hicn-extras-build.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
+
+- job-template:
+    name: 'hicn-extras-arm-build-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}arm-us'
+
+    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:
+          server-name: 'Primary'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'build-extras'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+
+    builders:
+      - config-file-provider:
+          files:
+            - file-id: '.packagecloud'
+              target: '/root/.packagecloud'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/root/packagecloud_api'
+      - 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-sysrepo-build.sh
+          - include-raw-hicn-extras-build.sh
       - provide-maven-settings:
           settings-file: 'hicn-settings'
           global-settings-file: 'global-settings'
@@ -449,16 +853,8 @@
           - include-raw-hicn-maven-push.sh
 
     publishers:
-      - 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'
+          maven-version: 'mvn36'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1