Merge "Add INFO.yaml verify job"

[ci-management.git] / jjb / jvpp / jvpp.yaml

diff --git a/jjb/jvpp/jvpp.yaml b/jjb/jvpp/jvpp.yaml
index a526bd1..dc8d209 100644 (file)
--- a/jjb/jvpp/jvpp.yaml
+++ b/jjb/jvpp/jvpp.yaml
@@ -9,19 +9,25 @@
       - ubuntu1604:
           repo-os-part: 'ubuntu.xenial.main'
           skip-site: 'false'
-          skip-jar-deploy: 'false'
+          skip-jar-deploy: 'true'
+          vpp-job-prefix: ''
       - ubuntu1804:
           repo-os-part: 'ubuntu.bionic.main'
           skip-site: 'false'
           skip-jar-deploy: 'false'
+          vpp-job-prefix: 'beta-'
       - centos7:
           repo-os-part: 'centos7'
           skip-site: 'true'
           skip-jar-deploy: 'true'
+          vpp-job-prefix: ''
     stream:
       - master:
           branch: 'master'
           repo-stream-part: 'master'
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
 
 - project:
     name: jvpp-view
@@ -35,6 +41,15 @@
     project-type: freestyle
     node: '{os}-us'
     concurrent: true
+    archive-artifacts: >
+      **/build-root/packages/*.rpm
+      **/build-root/packages/*.deb
+      **/tmp/jvpp-failed-unittests/*/* **/core
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -53,6 +68,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:
@@ -70,24 +89,16 @@
           branch: '{branch}'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: openjdk11
       - shell:
           !include-raw-escape:
           - ../scripts/setup_jvpp_dev_env.sh
           - include-raw-jvpp-build.sh
 
     publishers:
-      - archive:
-          artifacts: >
-            **/build-root/packages/*.rpm,
-            **/build-root/packages/*.deb
-
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-          archive-artifacts: '/tmp/jvpp-failed-unittests/*/* **/core'
+          maven-version: 'mvn36'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 2
@@ -100,6 +111,14 @@
 
     project-type: freestyle
     node: '{os}-us'
+    archive-artifacts: >
+      **/build-root/packages/*.rpm
+      **/build-root/packages/*.deb
+    allow-empty: 'true'
+    fingerprint: false
+    only-if-success: true
+    default-excludes: false
+
 
     build-discarder:
       daysToKeep: '{build-days-to-keep}'
@@ -115,13 +134,17 @@
       - os-parameter:
           os: '{os}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - stream-parameter:
           stream: '{stream}'
       - 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:
@@ -138,10 +161,12 @@
           name: '{project}'
           branch: '{branch}'
       - reverse:
-          jobs: 'vpp-merge-{stream}-{os}'
+          jobs: 'vpp-{vpp-job-prefix}merge-{stream}-{os}'
           result: 'success'
 
     builders:
+      - lf-update-java-alternatives:
+          java-version: openjdk11
       - config-file-provider:
           files:
             - file-id: '.packagecloud'
@@ -151,9 +176,9 @@
             - file-id: 'packagecloud_api'
               target: '/root'
       - maven-target:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           goals: '--version'
-          settings: 'vpp-settings'
+          settings: 'jvpp-settings'
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
@@ -173,19 +198,20 @@
           - include-raw-jvpp-maven-push.sh
 
     publishers:
-      - archive:
-          artifacts: >
-            **/build-root/packages/*.rpm,
-            **/build-root/packages/*.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
           fixed-delay: 90
       - email-notification:
           email-prefix: '[jvpp]'
+
+- project:
+    name: jvpp-info
+    project-name: jvpp
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: jvpp
+    branch: master