X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fjvpp%2Fjvpp.yaml;h=dc8d20974b407076ad24cf67fe453cdf8ac729c6;hb=c0bebffbd23b146587f9581b58ebab03f1b7c7a6;hp=1a99ed2cb5feee3dd2b0dc6b3f7a9082d5d458e1;hpb=ad682cc1bcc04b8ea27f1e535c45240702769a7c;p=ci-management.git

diff --git a/jjb/jvpp/jvpp.yaml b/jjb/jvpp/jvpp.yaml
index 1a99ed2cb..dc8d20974 100644
--- a/jjb/jvpp/jvpp.yaml
+++ b/jjb/jvpp/jvpp.yaml
@@ -3,24 +3,31 @@
     name: jvpp
     jobs:
       - 'jvpp-verify-{stream}-{os}'
+      - 'jvpp-merge-{stream}-{os}'
     project: 'jvpp'
     os:
       - 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
@@ -34,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}'
@@ -52,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:
@@ -69,24 +89,129 @@
           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: 'mvn36'
       - naginator:
           rerun-unstable-builds: false
           max-failed-builds: 2
           fixed-delay: 90
       - email-notification:
           email-prefix: '[jvpp]'
+
+- job-template:
+    name: 'jvpp-merge-{stream}-{os}'
+
+    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}'
+      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: 'mvn36'
+      - maven-exec:
+          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:
+          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}'
+      - reverse:
+          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'
+              target: '/root'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/root'
+      - maven-target:
+          maven-version: 'mvn36'
+          goals: '--version'
+          settings: 'jvpp-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+      - shell:
+          !include-raw-escape:
+          - ../scripts/setup_jvpp_dev_env.sh
+          - include-raw-jvpp-build.sh
+      - provide-maven-settings:
+          settings-file: 'jvpp-settings'
+          global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ./include-raw-jvpp-packetcloud-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/maven_push_functions.sh
+          - include-raw-jvpp-maven-push.sh
+
+    publishers:
+      - fdio-infra-shiplogs:
+          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