Merge "Do not skip commit-message-only checkstyle"

diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml
index 54ab5a7..2682755 100644 (file)
--- a/jjb/cicn/cicn.yaml
+++ b/jjb/cicn/cicn.yaml
@@ -51,6 +51,25 @@
       - short
       - long
 
+- project:
+    name: cicn-libparc-arm64
+    jobs:
+      - 'cicn-arm64-libparc-verify-{stream}-{os}'
+      - 'cicn-arm64-libparc-merge-{stream}-{os}'
+
+    project: 'cicn'
+    stream:
+      - master:
+          branch: 'cframework/master'
+          repo-stream-part: 'master'
+    os:
+      - ubuntu1804:
+          repo-os-part: 'ubuntu-arm.bionic.main'
+
+    type:
+      - short
+      - long
+
 - project:
     name: cicn-libccnx-common
     jobs:
@@ -312,13 +331,6 @@
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/longbow/build/*.rpm
-      **/longbow/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -392,8 +404,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-longbow-verify-{stream}-{os}'
@@ -401,13 +412,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/longbow/build/*.rpm
-      **/longbow/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -448,8 +452,7 @@
           - include-raw-cicn-longbow-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-longbow-docs-merge-{stream}'
@@ -528,8 +531,7 @@
           - include-raw-cicn-longbow-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-longbow-docs-verify-{stream}'
@@ -592,21 +594,13 @@
           - include-raw-cicn-longbow-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libparc-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/libparc/build/*.rpm
-      **/libparc/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -686,8 +680,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libparc-verify-{stream}-{os}'
@@ -695,13 +688,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/libparc/build/*.rpm
-      **/libparc/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -742,8 +728,7 @@
           - include-raw-cicn-libparc-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libparc-docs-merge-{stream}'
@@ -822,8 +807,7 @@
           - include-raw-cicn-libparc-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libparc-docs-verify-{stream}'
@@ -886,22 +870,141 @@
           - include-raw-cicn-libparc-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
+      - lf-infra-publish
+
+- job-template:
+    name: 'cicn-arm64-libparc-merge-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}arm-us'
+
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      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'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
+      - stream-parameter:
+          stream: 'release'
+      - 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: '/home/jenkins/.packagecloud'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/home/jenkins/packagecloud_api'
+      - maven-target:
           maven-version: 'mvn33-new'
+          goals: '--version'
+          settings: 'cicn-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+      - shell:
+          !include-raw-escape:
+          - include-raw-cicn-libparc-build.sh
+      - provide-maven-settings:
+          settings-file: 'cicn-settings'
+          global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/maven_push_functions.sh
+          - include-raw-cicn-maven-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    name: 'cicn-arm64-libparc-verify-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}arm-us'
+    concurrent: true
+
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      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}'
+      - 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: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          name: '{project}'
+          branch: '{branch}'
+
+    builders:
+      - shell:
+          !include-raw-escape:
+          - include-raw-cicn-libparc-build.sh
 
+    publishers:
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libccnx-common-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/libccnx-common/build/*.rpm
-      **/libccnx-common/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -978,8 +1081,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libccnx-common-verify-{stream}-{os}'
@@ -987,13 +1089,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/libccnx-common/build/*.rpm
-      **/libccnx-common/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1034,21 +1129,13 @@
           - include-raw-cicn-libccnx-common-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libccnx-transport-rta-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/libccnx-transport-rta/build/*.rpm
-      **/libccnx-transport-rta/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1125,8 +1212,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libccnx-transport-rta-verify-{stream}-{os}'
@@ -1134,13 +1220,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/libccnx-transport-rta/build/*.rpm
-      **/libccnx-transport-rta/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1181,21 +1260,13 @@
           - include-raw-cicn-libccnx-transport-rta-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libccnx-portal-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/libccnx-portal/build/*.rpm
-      **/libccnx-portal/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1272,8 +1343,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libccnx-portal-verify-{stream}-{os}'
@@ -1281,13 +1351,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/libccnx-portal/build/*.rpm
-      **/libccnx-portal/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1328,21 +1391,13 @@
           - include-raw-cicn-libccnx-portal-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libicnet-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/build/*.rpm
-      **/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1419,8 +1474,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-libicnet-verify-{stream}-{os}'
@@ -1428,13 +1482,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/build/*.rpm
-      **/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1475,21 +1522,13 @@
           - include-raw-cicn-libicnet-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-metis-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/metis/build/*.rpm
-      **/metis/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1566,8 +1605,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-metis-verify-{stream}-{os}'
@@ -1575,13 +1613,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/metis/build/*.rpm
-      **/metis/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1622,21 +1653,13 @@
           - include-raw-cicn-metis-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-http-server-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/build/*.rpm
-      **/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1713,8 +1736,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-http-server-verify-{stream}-{os}'
@@ -1722,13 +1744,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/build/*.rpm
-      **/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1769,21 +1784,13 @@
           - include-raw-cicn-http-server-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-vpp-plugin-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/cicn-plugin/build/*.rpm
-      **/cicn-plugin/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1857,8 +1864,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-vpp-plugin-verify-{stream}-{os}'
@@ -1866,13 +1872,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/cicn-plugin/build/*.rpm
-      **/cicn-plugin/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -1913,23 +1912,13 @@
           - include-raw-cicn-vpp-plugin-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-viper-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/build/*.rpm
-      **/build/*.deb
-      **/libdash/build/*.rpm
-      **/libdash/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -2006,8 +1995,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-viper-verify-{stream}-{os}'
@@ -2015,15 +2003,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/build/*.rpm
-      **/build/*.deb
-      **/libdash/build/*.rpm
-      **/libdash/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -2064,23 +2043,13 @@
           - include-raw-cicn-viper-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-radio-emulators-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-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
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -2154,8 +2123,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-radio-emulators-verify-{stream}-{os}'
@@ -2163,15 +2131,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-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
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -2212,8 +2171,7 @@
           - include-raw-cicn-radio-emulators-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-android-sdk-merge-{stream}-{os}'
@@ -2275,8 +2233,7 @@
           - include-raw-cicn-android-sdk-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-android-sdk-verify-{stream}-{os}'
@@ -2332,21 +2289,13 @@
           - include-raw-cicn-android-sdk-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-vicn-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-builder-4c-4g'
-    archive-artifacts: >
-      **/build/*.rpm
-      **/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -2420,8 +2369,7 @@
           - ../scripts/packagecloud_push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'cicn-vicn-verify-{stream}-{os}'
@@ -2429,13 +2377,6 @@
     project-type: freestyle
     node: '{os}-builder-4c-4g'
     concurrent: true
-    archive-artifacts: >
-      **/build/*.rpm
-      **/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -2476,8 +2417,7 @@
           - include-raw-cicn-vicn-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - project:
     name: cicn-info

diff --git a/jjb/cicn/include-raw-cicn-libparc-docs.sh b/jjb/cicn/include-raw-cicn-libparc-docs.sh
index b669af0..cb4d698 100644 (file)
--- a/jjb/cicn/include-raw-cicn-libparc-docs.sh
+++ b/jjb/cicn/include-raw-cicn-libparc-docs.sh
@@ -57,7 +57,7 @@ if [[ ${JOB_NAME} == *merge* ]]; then
         <extension>
           <groupId>org.apache.maven.wagon</groupId>
            <artifactId>wagon-webdav-jackrabbit</artifactId>
-           <version>2.9</version>
+           <version>3.3.3</version>
         </extension>
       </extensions>
     </build>

diff --git a/jjb/csit/csit-func.yaml b/jjb/csit/csit-func.yaml
index c9a9863..565aefc 100644 (file)
--- a/jjb/csit/csit-func.yaml
+++ b/jjb/csit/csit-func.yaml
@@ -36,9 +36,6 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1908':
-          branch: 'rls1908'
-          branch-id: 'oper-rls1908'
     stream:
       - master:
           branch: 'master'
@@ -46,8 +43,8 @@
           branch: 'rls1901'
       - '1904':
           branch: 'rls1904'
-      - '1908':
-          branch: 'rls1908'
+      - '1908_1':
+          branch: 'rls1908_1'
 
 - job-template:
     name: 'csit-vpp-verify-{stream_timed}-{os}-weekly'
@@ -191,6 +188,11 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      # This is an automatic verify job, part of API coverage.
+      # CRC checking is needed to ensure vpp crc job breaks only when intended.
+      # Can be removed when this job is no longer needed for full API coverage.
+      - csit-fail-on-crc-mismatch-parameter:
+          fail-on-crc-mismatch: 'True'
 
     scm:
       - gerrit-trigger-scm:
@@ -203,9 +205,10 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - gerrit-trigger-patch-submitted:
+      - gerrit-trigger-manually-triggered:
           name: '{project}'
           branch: '{branch}'
+          comment-trigger-value: 'csit-virltest'
 
     builders:
       - shell:

diff --git a/jjb/csit/csit-perf.yaml b/jjb/csit/csit-perf.yaml
index bff30d8..dc30b14 100644 (file)
--- a/jjb/csit/csit-perf.yaml
+++ b/jjb/csit/csit-perf.yaml
@@ -22,16 +22,21 @@
       - 'csit-vpp-perf-mrr-daily-master{node-arch}':
           node-arch:
             - ''
+            - -2n-clx
             - -2n-skx
             - -2n-dnv
             - -3n-skx
             - -3n-dnv
             - -3n-tsh:
                 executor: 'ubuntu1804arm-us'
-                vpp-mrr-daily-periodicity: '0 16 * * 6'
-      - 'csit-vpp-perf-mrr-weekly-master-2n-skx'
+                vpp-mrr-daily-periodicity: '0 14 * * 0'
+      - 'csit-vpp-perf-mrr-weekly-master-{node-arch}':
+          node-arch:
+            - 2n-clx
+            - 2n-skx
       - 'csit-vpp-perf-ndrpdr-weekly-master-{node-arch}':
           node-arch:
+            - 2n-clx
             - 2n-skx
             - 3n-skx
             - 3n-hsw
@@ -39,6 +44,7 @@
       - 'csit-dpdk-perf-mrr-weekly-master{node-arch}':
           node-arch:
             - ''
+            - -2n-clx
             - -2n-skx
             - -3n-skx
       - 'csit-ligato-perf-verify-{stream}-{node-arch}'
@@ -48,7 +54,7 @@
     ligato-executor: 'ubuntu1804-basebuild-4c-4g'
     branch: 'master'
     branch-id: 'oper'
-    vpp-mrr-daily-periodicity: '0 14 * * 1,4'
+    vpp-mrr-daily-periodicity: '0 2,14 * * *'
     stream:
       - master:
           branch: 'master'
@@ -62,13 +68,14 @@
           branch: 'rls1904'
           branch-id: 'oper-rls1904'
           executor: 'ubuntu1804-us'
-      - '1908':
-          branch: 'rls1908'
-          branch-id: 'oper-rls1908'
+      - '1908_1':
+          branch: 'rls1908_1'
+          branch-id: 'oper-rls1908_1'
           executor: 'ubuntu1804-us'
 
     build-artifact-num-to-keep: 10
     node-arch:
+      - 2n-clx
       - 2n-skx
       - 2n-dnv
       - 3n-skx
@@ -144,6 +151,11 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      # This is a manually-triggered verify job, part of API coverage.
+      # CRC checking is needed to ensure vpp crc job breaks only when intended.
+      # Can be removed when this job is no longer needed for full API coverage.
+      - csit-fail-on-crc-mismatch-parameter:
+          fail-on-crc-mismatch: 'True'
 
     scm:
       - gerrit-trigger-scm:
@@ -253,13 +265,13 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-vpp-perf-mrr-weekly-master-2n-skx'
+    name: 'csit-vpp-perf-mrr-weekly-master-{node-arch}'
 
     description: |
       <ul>
           <li>objective
               <ul>
-                  <li>check vpp perf mrr weekly on 2n-skx
+                  <li>check vpp perf mrr weekly on {node-arch}
               </ul>
           <li>perf test-cases selection
               <ul>

diff --git a/jjb/csit/csit-tox.yaml b/jjb/csit/csit-tox.yaml
index a4c3182..49603a1 100644 (file)
--- a/jjb/csit/csit-tox.yaml
+++ b/jjb/csit/csit-tox.yaml
@@ -14,8 +14,8 @@
           branch: 'rls1901'
       - '1904':
           branch: 'rls1904'
-      - '1908':
-          branch: 'rls1908'
+      - '1908_1':
+          branch: 'rls1908_1'
 
 - job-template:
     name: 'csit-verify-tox-{stream}'

diff --git a/jjb/csit/csit-vpp-device.yaml b/jjb/csit/csit-vpp-device.yaml
index f16dae5..70dee6d 100644 (file)
--- a/jjb/csit/csit-vpp-device.yaml
+++ b/jjb/csit/csit-vpp-device.yaml
@@ -39,9 +39,6 @@
       - master:
           branch: 'master'
           branch-id: 'oper'
-      - '1908':
-          branch: 'rls1908'
-          branch-id: 'oper-rls1908'
     stream:
       - master:
           branch: 'master'
@@ -53,8 +50,8 @@
           branch: 'rls1904'
           branch-id: 'oper-rls1904'
       - '1908':
-          branch: 'rls1908'
-          branch-id: 'oper-rls1908'
+          branch: 'rls1908_1'
+          branch-id: 'oper-rls1908_1'
     exclude:
       - stream: '1901'
         os: 'ubuntu1804'
@@ -127,6 +124,11 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      # This is an automatic verify job, part of API coverage.
+      # CRC checking is needed to ensure vpp crc job breaks only when intended.
+      # Unlikely to be removed, as this job is primary source of API coverage.
+      - csit-fail-on-crc-mismatch-parameter:
+          fail-on-crc-mismatch: 'True'
 
     scm:
       - gerrit-trigger-scm:

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 2f1dc85..ee6a65f 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -19,8 +19,6 @@
     jobs:
       - 'csit-docs-merge-{stream_timed}'
       - 'csit-report-merge-{stream}'
-      - 'csit-report-merge-1901_3'
-      - 'csit-report-merge-1904_2'
       - 'csit-trending-daily-master'
 
     project: 'csit'
@@ -32,9 +30,6 @@
       - master:
           branch: 'master'
           executor: 'ubuntu1804-us'
-      - '1908':
-          branch: 'rls1908'
-          executor: 'ubuntu1804-us'
     stream:
       - master:
           branch: 'master'
@@ -47,7 +42,8 @@
           executor: 'ubuntu1804-us'
       - '1908':
           branch: 'rls1908'
-          executor: 'ubuntu1804-us'
+      - '1908_1':
+          branch: 'rls1908_1'
 
 - project:
     name: csit-view
@@ -208,156 +204,6 @@
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 
-- job-template:
-    name: 'csit-report-merge-1901_3'
-
-    project-type: freestyle
-    node: '{executor-large}'
-    concurrent: false
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: 'rls1901_3'
-      - 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:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'default'
-
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-report'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/rls1901_3'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'csit-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'csit-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape: include-raw-csit-report.sh
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'csit-report-merge-1904_2'
-
-    project-type: freestyle
-    node: '{executor-large}'
-    concurrent: false
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: 'rls1904_2'
-      - 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:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'default'
-
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'run-report'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/rls1904_2'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'csit-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'csit-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape: include-raw-csit-report.sh
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
 - job-template:
     name: 'csit-trending-daily-master'
 
@@ -422,6 +268,36 @@
           always: true
           failure: false
 
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Regressions as of  $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Following regressions occured in the last trending job runs, listed per testbed type.
+
+                ${{FILE,path="build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/trending-regressions.txt"}}
+
+          always: true
+          failure: false
+
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Progressions as of  $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Following progressions occured in the last trending job runs, listed per testbed type.
+
+                ${{FILE,path="build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/trending-progressions.txt"}}
+
+          always: true
+          failure: false
+
       - fdio-infra-shiplogs:
           maven-version: 'mvn33-new'
 

diff --git a/jjb/csit/include-raw-csit-cpta.sh b/jjb/csit/include-raw-csit-cpta.sh
index e3a1184..195e255 100644 (file)
--- a/jjb/csit/include-raw-csit-cpta.sh
+++ b/jjb/csit/include-raw-csit-cpta.sh
@@ -6,24 +6,33 @@ set -xe -o pipefail
 [ "${PROJECT_PATH}" ] || PROJECT_PATH="io/fd/csit"
 [ "${DOC_DIR}" ] || DOC_DIR="resources/tools/presentation"
 [ "${BUILD_DIR}" ] || BUILD_DIR="${DOC_DIR}/_build"
-[ "${SECONDARY_BUILD_DIR}" ] || SECONDARY_BUILD_DIR="${DOC_DIR}_new/_build"
 [ "${SITE_DIR}" ] || SITE_DIR="build-root/docs/deploy-site"
 [ "${RESOURCES_DIR}" ] || RESOURCES_DIR="${SITE_DIR}/src/site/resources/trending"
-[ "${SECONDARY_RESOURCES_DIR}" ] || SECONDARY_RESOURCES_DIR="${RESOURCES_DIR}/new"
+[ "${STATIC_VPP_DIR}" ] || STATIC_VPP_DIR="${RESOURCES_DIR}/_static/vpp"
 [ "${MVN}" ] || MVN="/opt/apache/maven/bin/mvn"
+[ "${FAILED_TESTS}" ] || FAILED_TESTS="${STATIC_VPP_DIR}/trending-failed-tests.txt"
+[ "${REGRESSIONS}" ] || REGRESSIONS="${STATIC_VPP_DIR}/trending-regressions.txt"
+[ "${PROGRESSIONS}" ] || PROGRESSIONS="${STATIC_VPP_DIR}/trending-progressions.txt"
+
+# Create a text file with email body in case the build fails:
+cd "${WORKSPACE}"
+mkdir -p "${STATIC_VPP_DIR}"
+EMAIL_BODY="ERROR: The build number ${BUILD_NUMBER} of the job ${JOB_NAME} failed. For more information see: ${BUILD_URL}"
+echo "${EMAIL_BODY}" > "${FAILED_TESTS}"
+echo "${EMAIL_BODY}" > "${REGRESSIONS}"
+echo "${EMAIL_BODY}" > "${PROGRESSIONS}"
 
 cd "${DOC_DIR}"
 chmod +x ./run_cpta.sh
 STATUS=$(./run_cpta.sh | tail -1)
 
 cd "${WORKSPACE}"
+rm -rf "${SITE_DIR}/"*
 
 mkdir -p "${RESOURCES_DIR}"
-mv -f ${BUILD_DIR}/* "${RESOURCES_DIR}"
-if [ -d "${SECONDARY_BUILD_DIR}" ]; then
-    mkdir -p "${SECONDARY_RESOURCES_DIR}"
-    mv -f "${SECONDARY_BUILD_DIR}"/* "${SECONDARY_RESOURCES_DIR}"
-fi
+ls "${RESOURCES_DIR}"
+mv -f "${BUILD_DIR}/"* "${RESOURCES_DIR}"
+
 cd "${SITE_DIR}"
 
 cat > pom.xml << EOF
@@ -41,7 +50,6 @@ cat > pom.xml << EOF
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
                 <artifactId>wagon-webdav-jackrabbit</artifactId>
-                <version>2.9</version>
             </extension>
         </extensions>
     </build>

diff --git a/jjb/csit/include-raw-csit-docs.sh b/jjb/csit/include-raw-csit-docs.sh
index 3c962b9..0bc8264 100644 (file)
--- a/jjb/csit/include-raw-csit-docs.sh
+++ b/jjb/csit/include-raw-csit-docs.sh
@@ -43,7 +43,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then
         <extension>
           <groupId>org.apache.maven.wagon</groupId>
           <artifactId>wagon-webdav-jackrabbit</artifactId>
-          <version>2.9</version>
         </extension>
       </extensions>
     </build>

diff --git a/jjb/csit/include-raw-csit-report.sh b/jjb/csit/include-raw-csit-report.sh
index b72bf83..731cef9 100644 (file)
--- a/jjb/csit/include-raw-csit-report.sh
+++ b/jjb/csit/include-raw-csit-report.sh
@@ -43,7 +43,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then
         <extension>
           <groupId>org.apache.maven.wagon</groupId>
           <artifactId>wagon-webdav-jackrabbit</artifactId>
-          <version>2.9</version>
         </extension>
       </extensions>
     </build>

diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml
index 7172ee5..51aec55 100644 (file)
--- a/jjb/deb_dpdk/deb_dpdk.yaml
+++ b/jjb/deb_dpdk/deb_dpdk.yaml
@@ -86,8 +86,7 @@
           - include-raw-deb_dpdk-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'deb_dpdk-verify-image-{stream}-{os}'
@@ -146,8 +145,7 @@
           - include-raw-deb_dpdk-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'deb_dpdk-merge-{stream}-{os}'
@@ -213,8 +211,7 @@
           - include-raw-deb_dpdk-pkg-push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - project:
     name: deb_dpdk-info

diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml
index 8cf673b..274f6a4 100644 (file)
--- a/jjb/dmm/dmm.yaml
+++ b/jjb/dmm/dmm.yaml
@@ -94,8 +94,7 @@
           !include-raw-escape: include-raw-dmm-test-checkstyle.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'dmm-verify-{stream}-{os}'
@@ -138,8 +137,7 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'dmm-merge-{stream}-{os}'
@@ -180,8 +178,7 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'dmm-csit-verify-func-{stream}-{os}-virl'
@@ -230,9 +227,7 @@
     publishers:
       - robot-report:
           output-path: 'csit'
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - project:
     name: dmm-info

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index a179b13..a953421 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -114,7 +114,7 @@
       - string:
           name: FDIO_CSIT_FAIL_ON_CRC_MISMATCH
           default: '{fail-on-crc-mismatch}'
-          description: "If false, CRC is not checked, so compatibility is tested."
+          description: "If true, CRC is checked, else compatibility is tested."
 
 - parameter:
     name: gerrit-event-type-parameter

diff --git a/jjb/hicn/hicn-docs.yaml b/jjb/hicn/hicn-docs.yaml
index 420b97d..efd15f6 100644 (file)
--- a/jjb/hicn/hicn-docs.yaml
+++ b/jjb/hicn/hicn-docs.yaml
@@ -82,8 +82,7 @@
           !include-raw-escape: include-raw-hicn-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -169,8 +168,7 @@
           !include-raw-escape: include-raw-hicn-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1

diff --git a/jjb/hicn/hicn.yaml b/jjb/hicn/hicn.yaml
index 541a0c5..3fe840c 100644 (file)
--- a/jjb/hicn/hicn.yaml
+++ b/jjb/hicn/hicn.yaml
@@ -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:
@@ -136,8 +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
@@ -149,13 +168,58 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
-    archive-artifacts: >
-      **/build/*.rpm,
-      **/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:
+      - lf-infra-publish
+
+- job-template:
+    name: 'hicn-arm-verify-{stream}-{os}'
+
+    project-type: freestyle
+    node: '{os}arm-us'
+    concurrent: true
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -208,13 +272,93 @@
 
     project-type: freestyle
     node: '{os}-us'
-    archive-artifacts: >
-      **/build/*.rpm,
-      **/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:
+      - 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'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -315,13 +459,6 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
-    archive-artifacts: >
-      **/build/*.rpm,
-      **/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -374,21 +511,13 @@
           - 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}'
 
     project-type: freestyle
     node: '{os}-us'
-    archive-artifacts: >
-      **/build/*.rpm,
-      **/build/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -473,8 +602,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

diff --git a/jjb/hicn/include-raw-hicn-docs.sh b/jjb/hicn/include-raw-hicn-docs.sh
index 1bb4f30..6aa95f2 100644 (file)
--- a/jjb/hicn/include-raw-hicn-docs.sh
+++ b/jjb/hicn/include-raw-hicn-docs.sh
@@ -55,7 +55,7 @@ if [[ ${JOB_NAME} == *merge* ]]; then
         <extension>
           <groupId>org.apache.maven.wagon</groupId>
            <artifactId>wagon-webdav-jackrabbit</artifactId>
-           <version>2.9</version>
+           <version>3.3.3</version>
         </extension>
       </extensions>
     </build>

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 73aca1e..f85eafd 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -82,8 +82,7 @@
     publishers:
       - email-notification:
           email-prefix: '[honeycomb]'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - lf-infra-publish
 
 - job-template:
     name: 'honeycomb-merge-{stream}-{os}'
@@ -164,8 +163,7 @@
           id: ''
           unique-version: true
           deploy-unstable: false
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - lf-infra-publish
 
 - job-template:
     name: 'honeycomb-benchmark-master-{os}'
@@ -281,8 +279,7 @@
                 # yamllint disable-line rule:line-length
                 exclude: 'simple-container,list-in-container,complex-list-in-container'
 
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - lf-infra-publish
 
 - project:
     name: honeycomb-info

diff --git a/jjb/jvpp/jvpp.yaml b/jjb/jvpp/jvpp.yaml
index dc8d209..234d7fb 100644 (file)
--- a/jjb/jvpp/jvpp.yaml
+++ b/jjb/jvpp/jvpp.yaml
@@ -97,8 +97,7 @@
           - include-raw-jvpp-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 2
@@ -198,8 +197,7 @@
           - include-raw-jvpp-maven-push.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn36'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1

diff --git a/jjb/puppet-fdio/puppet-fdio.yaml b/jjb/puppet-fdio/puppet-fdio.yaml
index abd54c7..4d705ae 100644 (file)
--- a/jjb/puppet-fdio/puppet-fdio.yaml
+++ b/jjb/puppet-fdio/puppet-fdio.yaml
@@ -118,8 +118,7 @@
           ./scripts/ci-beaker.sh {os}
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - project:
     name: puppet-fdio-info

diff --git a/jjb/sweetcomb/include-raw-sweetcomb-build.sh b/jjb/sweetcomb/include-raw-sweetcomb-build.sh
index b03b0ef..639d7fd 100644 (file)
--- a/jjb/sweetcomb/include-raw-sweetcomb-build.sh
+++ b/jjb/sweetcomb/include-raw-sweetcomb-build.sh
@@ -22,12 +22,20 @@ function setup {
                 echo "Deleting: /etc/apt/sources.list.d/99fd.io.list"
                 sudo rm /etc/apt/sources.list.d/99fd.io.list
             fi
+            if [ -f /etc/apt/sources.list.d/fdio_master.list ];then
+                echo "Deleting: /etc/apt/sources.list.d/fdio_master.list"
+                sudo rm /etc/apt/sources.list.d/fdio_master.list
+            fi
             curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.deb.sh | sudo bash
         elif [ "$OS_ID" == "centos" ]; then
             if [ -f /etc/yum.repos.d/fdio-master.repo ]; then
                 echo "Deleting: /etc/yum.repos.d/fdio-master.repo"
                 sudo rm /etc/yum.repos.d/fdio-master.repo
             fi
+            if [ -f /etc/yum.repos.d/fdio_master.repo ]; then
+                echo "Deleting: /etc/yum.repos.d/fdio_master.repo"
+                sudo rm /etc/yum.repos.d/fdio_master.repo
+            fi
             curl -s https://packagecloud.io/install/repositories/fdio/${STREAM}/script.rpm.sh | sudo bash
         fi
     fi

diff --git a/jjb/sweetcomb/sweetcomb.yaml b/jjb/sweetcomb/sweetcomb.yaml
index 13b1134..f1d0cdb 100644 (file)
--- a/jjb/sweetcomb/sweetcomb.yaml
+++ b/jjb/sweetcomb/sweetcomb.yaml
@@ -57,13 +57,6 @@
     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}'
@@ -120,8 +113,7 @@
           !include-raw-escape:
           - include-raw-sweetcomb-build.sh
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -132,13 +124,6 @@
 
     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}'
@@ -195,8 +180,7 @@
           !include-raw-escape:
           - ../scripts/packagecloud_push.sh
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -256,8 +240,7 @@
           - include-raw-sweetcomb-build.sh
           - include-raw-sweetcomb-test.sh
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1

diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml
index d1d936a..5380ce9 100644 (file)
--- a/jjb/tldk/tldk.yaml
+++ b/jjb/tldk/tldk.yaml
@@ -78,8 +78,7 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-verify-image-{stream}-{os}'
@@ -139,8 +138,7 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-merge-{stream}-{os}'
@@ -185,8 +183,7 @@
           !include-raw-escape: include-raw-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'tldk-csit-verify-func-{stream}-{os}-virl'
@@ -239,9 +236,7 @@
     publishers:
       - robot-report:
           output-path: ''
-
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - project:
     name: tldk-info

diff --git a/jjb/trex/trex.yaml b/jjb/trex/trex.yaml
index e85b791..0d8cea9 100644 (file)
--- a/jjb/trex/trex.yaml
+++ b/jjb/trex/trex.yaml
@@ -62,8 +62,7 @@
           !include-raw-escape: include-raw-trex-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - job-template:
     name: 'trex-merge-{stream}-{os}'
@@ -106,8 +105,7 @@
           !include-raw-escape: include-raw-trex-build.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
 
 - project:
     name: trex-info

diff --git a/jjb/udpi/udpi.yaml b/jjb/udpi/udpi.yaml
index 2b02518..1d910d0 100644 (file)
--- a/jjb/udpi/udpi.yaml
+++ b/jjb/udpi/udpi.yaml
@@ -44,13 +44,6 @@
     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}'
@@ -103,8 +96,7 @@
               target: '/root'
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -114,13 +106,6 @@
 
     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}'
@@ -170,8 +155,7 @@
               target: '/root'
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1

diff --git a/jjb/vpp/docs.yaml b/jjb/vpp/docs.yaml
index 74f2930..72a0647 100644 (file)
--- a/jjb/vpp/docs.yaml
+++ b/jjb/vpp/docs.yaml
@@ -9,8 +9,8 @@
 
     project: 'vpp'
     os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
 
     stream:
       - master:
@@ -38,8 +38,8 @@
 
     project: 'vpp'
     os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
 
     stream:
       - master:
@@ -53,7 +53,7 @@
     name: 'vpp-docs-verify-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-us
     concurrent: true
     allow-empty: 'true'
     fingerprint: false
@@ -73,7 +73,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -111,18 +111,17 @@
           !include-raw-escape: include-raw-vpp-docs.sh
 
     publishers:
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-        - naginator:
-            rerun-unstable-builds: false
-            max-failed-builds: 1
-            fixed-delay: 90
+      - lf-infra-publish
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
 
 - job-template:
     name: 'vpp-docs-merge-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-us
     concurrent: false
     archive-artifacts: '**/build-root/docs/html/*'
     allow-empty: 'true'
@@ -143,7 +142,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -164,7 +163,7 @@
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1604'
+          jobs: 'vpp-merge-{stream}-ubuntu1804'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -200,8 +199,7 @@
           !include-raw-escape: include-raw-vpp-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -211,7 +209,7 @@
     name: 'vpp-sphinx-docs-verify-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-us
     concurrent: true
     allow-empty: 'true'
     fingerprint: false
@@ -230,7 +228,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -280,18 +278,17 @@
           !include-raw-escape: include-raw-vpp-sphinx-docs.sh
 
     publishers:
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-        - naginator:
-            rerun-unstable-builds: false
-            max-failed-builds: 1
-            fixed-delay: 90
+      - lf-infra-publish
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
 
 - job-template:
     name: 'vpp-sphinx-docs-merge-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-us
     concurrent: false
     archive-artifacts: 'docs/_build/html/*'
     allow-empty: 'true'
@@ -311,7 +308,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -360,18 +357,17 @@
           !include-raw-escape: include-raw-vpp-sphinx-docs.sh
 
     publishers:
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
-        - naginator:
-            rerun-unstable-builds: false
-            max-failed-builds: 1
-            fixed-delay: 90
+      - lf-infra-publish
+      - naginator:
+          rerun-unstable-builds: false
+          max-failed-builds: 1
+          fixed-delay: 90
 
 - job-template:
     name: 'vpp-make-test-docs-verify-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-us
     concurrent: true
     allow-empty: 'true'
     fingerprint: false
@@ -390,7 +386,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -428,8 +424,7 @@
           !include-raw-escape: include-raw-vpp-make-test-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -439,7 +434,7 @@
     name: 'vpp-make-test-docs-merge-{stream}'
 
     project-type: freestyle
-    node: ubuntu1604-us
+    node: ubuntu1804-us
     concurrent: false
     archive-artifacts: '**/test/doc/build/html/*'
     allow-empty: 'true'
@@ -460,7 +455,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - maven-exec:
           maven-version: 'mvn33-new'
       - stream-parameter:
@@ -482,7 +477,7 @@
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-ubuntu1604'
+          jobs: 'vpp-merge-{stream}-ubuntu1804'
           result: 'success'
       - gerrit:
           server-name: 'Primary'
@@ -518,8 +513,7 @@
           !include-raw-escape: include-raw-vpp-make-test-docs.sh
 
     publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+      - lf-infra-publish
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1

diff --git a/jjb/vpp/include-raw-vpp-arm-build.sh b/jjb/vpp/include-raw-vpp-arm-build.sh
index 906e185..9de736a 100644 (file)
--- a/jjb/vpp/include-raw-vpp-arm-build.sh
+++ b/jjb/vpp/include-raw-vpp-arm-build.sh
@@ -44,7 +44,6 @@ if (git log --oneline | grep 37682e1 > /dev/null 2>&1) && \
         [ "x${IS_CSIT_VPP_JOB}" != "xTrue" ]
 then
     echo "Building using \"make verify\""
-    sed -i '33i\ \ DEPENDS api_headers' src/vat/CMakeLists.txt
     [ "x${DRYRUN}" == "xTrue" ] || make UNATTENDED=yes verify SKIP_AARCH64=yes
 else
     echo "Building using \"make build-root/vagrant/build.sh\""

diff --git a/jjb/vpp/include-raw-vpp-clang-build.sh b/jjb/vpp/include-raw-vpp-clang-build.sh
index 5039d5c..b1bed41 100644 (file)
--- a/jjb/vpp/include-raw-vpp-clang-build.sh
+++ b/jjb/vpp/include-raw-vpp-clang-build.sh
@@ -29,7 +29,7 @@ echo "sha1sum of this script: ${0}"
 sha1sum $0
 
 make UNATTENDED=yes install-dep
-make UNATTENDED=yes dpdk-install-dev
+make UNATTENDED=yes install-ext-deps
 make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang install-packages
 make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang sample-plugin-install
 make UNATTENDED=yes -C build-root PLATFORM=vpp TAG=vpp_clang CC=clang CXX=clang libmemif-install

diff --git a/jjb/vpp/include-raw-vpp-coverity.sh b/jjb/vpp/include-raw-vpp-coverity.sh
new file mode 100644 (file)
index 0000000..47a316a
--- /dev/null
+++ b/jjb/vpp/include-raw-vpp-coverity.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+FILE="scan.txt"
+OUTPUT="output.txt"
+
+wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+dpkg -i google-chrome-stable_current_amd64.deb || true
+apt-get install -f -y
+
+google-chrome --headless --disable-gpu -dump-dom --no-sandbox https://scan.coverity.com/projects/fd-io-vpp > $FILE
+
+grep -i '<dt>Newly detected</dt>' $FILE || exit 42
+
+NEW=$(grep -i -B 1 '<dt>Newly detected</dt>' $FILE | grep -Eo '[0-9]{1,4}')
+ELIM=$(grep -i -B 1 '<dt>Eliminated</dt>' $FILE | grep -Eo '[0-9]{1,4}')
+OUT=$(grep -i -B 1 '<dt>Outstanding</dt>' $FILE | grep -Eo '[0-9]{1,4}')
+
+#ls -lg $FILE
+#cat $FILE
+
+if [ "${OUT}" == "0" ]; then
+        echo 'Current outstanding issues are zero' > $OUTPUT
+        echo "Newly detected: $NEW" >> $OUTPUT
+               echo "Eliminated: $ELIM" >> $OUTPUT
+               echo "More details can be found at  https://scan.coverity.com/projects/fd-io-vpp/view_defects" >> $OUTPUT
+else
+        echo "Current number of outstanding issues are $OUT Failing job"
+        echo "Current number of outstanding issues are $OUT" > $OUTPUT
+        echo "Newly detected: $NEW" >> $OUTPUT
+               echo "Eliminated: $ELIM" >> $OUTPUT
+               echo "More details can be found at  https://scan.coverity.com/projects/fd-io-vpp/view_defects" >> $OUTPUT
+        exit 1
+fi

diff --git a/jjb/vpp/include-raw-vpp-docs.sh b/jjb/vpp/include-raw-vpp-docs.sh
index 760eaea..c0bebf3 100644 (file)
--- a/jjb/vpp/include-raw-vpp-docs.sh
+++ b/jjb/vpp/include-raw-vpp-docs.sh
@@ -33,7 +33,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then
         <extension>
           <groupId>org.apache.maven.wagon</groupId>
            <artifactId>wagon-webdav-jackrabbit</artifactId>
-           <version>2.9</version>
         </extension>
       </extensions>
     </build>

diff --git a/jjb/vpp/include-raw-vpp-make-test-docs.sh b/jjb/vpp/include-raw-vpp-make-test-docs.sh
index 9860e00..6938cdd 100644 (file)
--- a/jjb/vpp/include-raw-vpp-make-test-docs.sh
+++ b/jjb/vpp/include-raw-vpp-make-test-docs.sh
@@ -32,7 +32,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then
         <extension>
           <groupId>org.apache.maven.wagon</groupId>
            <artifactId>wagon-webdav-jackrabbit</artifactId>
-           <version>2.9</version>
         </extension>
       </extensions>
     </build>

diff --git a/jjb/vpp/include-raw-vpp-sphinx-docs.sh b/jjb/vpp/include-raw-vpp-sphinx-docs.sh
index 4d14e7a..357e780 100644 (file)
--- a/jjb/vpp/include-raw-vpp-sphinx-docs.sh
+++ b/jjb/vpp/include-raw-vpp-sphinx-docs.sh
@@ -33,7 +33,6 @@ if [[ ${JOB_NAME} == *merge* ]]; then
         <extension>
           <groupId>org.apache.maven.wagon</groupId>
            <artifactId>wagon-webdav-jackrabbit</artifactId>
-           <version>2.9</version>
         </extension>
       </extensions>
     </build>

diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index dc1672e..a866115 100644 (file)
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -30,6 +30,7 @@
     name: vpp-clang
     jobs:
       - 'vpp-verify-{stream}-clang'
+      - 'vpp-coverity-{stream}'
 
     project: 'vpp'
     os:
@@ -63,7 +64,7 @@
       - '1908':
           branch: 'stable/1908'
           repo-stream-part: 'stable.1908'
-    os: ubuntu1604
+    os: ubuntu1804
 
 - project:
     name: vpp-perpatch
@@ -181,16 +182,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-      **/tmp/vpp-failed-unittests/*/* **/core
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     triggers:
       - gerrit-trigger-checkstyle:
@@ -250,15 +242,6 @@
 
     project-type: freestyle
     node: '{os}-us'
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -333,15 +316,7 @@
     project-type: freestyle
     node: '{os}arm-us'
     concurrent: true
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -392,7 +367,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
@@ -403,15 +377,6 @@
 
     project-type: freestyle
     node: '{os}arm-m'
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -488,6 +453,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -503,7 +469,7 @@
       - os-parameter:
           os: '{os}'
       - repo-name-parameter:
-          repo-name: '{repo-stream-part}.ubuntu.xenial.main'
+          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
 
     scm:
       - gerrit-trigger-scm:
@@ -577,7 +543,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: true
           max-failed-builds: 1
@@ -589,15 +554,7 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -647,7 +604,6 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 2
@@ -659,6 +615,7 @@
     project-type: freestyle
     node: 'ubuntu1804-us'
     concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -672,7 +629,7 @@
       - gerrit-parameter:
           branch: '{branch}'
       - os-parameter:
-          os: 'ubuntu1604'
+          os: 'ubuntu1804'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.ubuntu.bionic.main'
       - stream-parameter:
@@ -704,26 +661,115 @@
     publishers:
       - fdio-infra-shiplogs:
           maven-version: 'mvn36'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 1
           fixed-delay: 90
 
+- job-template:
+    name: 'vpp-coverity-{stream}'
+
+    project-type: freestyle
+    node: 'ubuntu1804-us'
+    concurrent: true
+    archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
+
+    build-discarder:
+      daysToKeep: '{build-days-to-keep}'
+      numToKeep: '{build-num-to-keep}'
+      artifactDaysToKeep: '{build-artifact-days-to-keep}'
+      artifactNumToKeep: '{build-artifact-num-to-keep}'
+
+    parameters:
+      - project-parameter:
+          project: '{project}'
+      - gerrit-parameter:
+          branch: '{branch}'
+      - os-parameter:
+          os: 'ubuntu1804'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.ubuntu.bionic.main'
+      - stream-parameter:
+          stream: '{stream}'
+
+    scm:
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: '0 14 * * *'
+
+    builders:
+      - shell:
+          command: !include-raw-escape: include-raw-vpp-coverity.sh
+          unstable-return: 42
+
+    publishers:
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'ejk@cisco.com'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Coverity run passing as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Coverity run passing.
+
+                ${{FILE,path="output.txt"}}
+          failure: false
+          success: true
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'ejk@cisco.com'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Coverity run UNSTABLE as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Coverity run UNSTABLE.
+
+                Something went wrong with daily scan.
+          failure: false
+          unstable: true
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'vpp-dev@lists.fd.io, ejk@cisco.com'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Coverity run FAILED as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Coverity run failed today.
+
+                ${{FILE,path="output.txt"}}
+          failure: true
+      - email-ext:
+          # yamllint disable-line rule:line-length
+          recipients: 'vpp-dev@lists.fd.io, ejk@cisco.com'
+          reply-to: ''
+          content-type: 'text'
+          subject: 'Coverity run as of $BUILD_TIMESTAMP'
+          # yamllint disable-line rule:line-length
+          body: |
+                Coverity run fixed today.
+
+                ${{FILE,path="output.txt"}}
+          failure: false
+          fixed: true
+      - fdio-infra-shiplogs:
+          maven-version: 'mvn36'
+
 - job-template:
     name: 'vpp-merge-{stream}-{os}'
 
     project-type: freestyle
     node: '{os}-us'
-    archive-artifacts: >
-      **/build-root/*.rpm
-      **/build-root/*.deb
-      **/dpdk/*.rpm
-      **/dpdk/*.deb
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -832,9 +878,6 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
-      # The API CRC job fails on mismatch, we hunt for real incompatibilities.
-      - csit-fail-on-crc-mismatch-parameter:
-          fail-on-crc-mismatch: 'False'
 
     scm:
       - gerrit-trigger-scm:
@@ -913,9 +956,6 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
-      # The API CRC job fails on mismatch, try compare API versions if possible.
-      - csit-fail-on-crc-mismatch-parameter:
-          fail-on-crc-mismatch: 'False'
 
     scm:
       - gerrit-trigger-scm:
@@ -976,6 +1016,10 @@
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
           description: Artifacts to archive to the logs server.
+      # Not sure whether not failing has any useful usage,
+      # but it does not hurt to have some flexibility for future.
+      - csit-fail-on-crc-mismatch-parameter:
+          fail-on-crc-mismatch: 'True'
 
     scm:
       - gerrit-trigger-scm:

diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index c109676..915c841 100644 (file)
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -112,6 +112,17 @@
           - libibverbs-dev
           - ruby-dev
           - zip
+          - libevent-dev
+          - libboost-system-dev
+          - libcurl4-openssl-dev
+          - libboost-regex-dev
+          - libboost-filesystem-dev
+          - git-core
+          - libqtav-dev
+          - libavcodec-dev
+          - libavformat-dev
+          - libswscale-dev
+          - libavresample-dev
         state: present
       # yamllint disable-line rule:line-length
       when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '18.04'