Merge "Add INFO.yaml verify job"

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

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 11e318f..fe19c9b 100644 (file)
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -5,13 +5,16 @@
       - 'hc2vpp-verify-{stream}-{os}'
       - 'hc2vpp-merge-{stream}-{os}'
       - 'hc2vpp-integration-{stream}-{os}'
-      - 'hc2vpp-verify-image-{stream}-{os}'
     project: 'hc2vpp'
     os:
-      - ubuntu1604:
-          repo-os-part: 'ubuntu.xenial.main'
+      - ubuntu1804:
+          repo-os-part: 'ubuntu.bionic.main'
           skip-site: 'false'
           skip-jar-deploy: 'false'
+      - ubuntu1604:
+          repo-os-part: 'ubuntu.xenial.main'
+          skip-site: 'true'
+          skip-jar-deploy: 'true'
       - centos7:
           repo-os-part: 'centos7'
           skip-site: 'true'
@@ -20,18 +23,15 @@
       - master:
           branch: 'master'
           repo-stream-part: 'master'
-      - '1804':
-          branch: 'stable/1804'
-          repo-stream-part: 'stable.1804'
-      - '1807':
-          branch: 'stable/1807'
-          repo-stream-part: 'stable.1807'
       - '1810':
           branch: 'stable/1810'
           repo-stream-part: 'stable.1810'
       - '1901':
           branch: 'stable/1901'
           repo-stream-part: 'stable.1901'
+      - '1904':
+          branch: 'stable/1904'
+          repo-stream-part: 'stable.1904'
 
 - project:
     name: hc2vpp-view
@@ -42,7 +42,7 @@
 - job-template:
     name: 'hc2vpp-verify-{stream}-{os}'
     project-type: maven
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
 
@@ -76,7 +76,7 @@
           branch: '{branch}'
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge site'
@@ -90,78 +90,12 @@
       - email-notification:
           email-prefix: '[hc2vpp]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
-- job-template:
-    name: 'hc2vpp-verify-image-{stream}-{os}'
-    project-type: maven
-    node: '{os}-basebuild-4c-4g'
-    concurrent: true
-    jdk: openjdk8-{os}
-
-    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}'
-
-    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:
-          server-name: 'Primary'
-          trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'verify-images'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-          skip-vote:
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-
-    maven:
-      maven-name: 'mvn33-new'
-      root-pom: 'pom.xml'
-      # yamllint disable-line rule:line-length
-      goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge'
-      maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
-      settings: 'hc2vpp-settings'
-      settings-type: cfp
-      global-settings: 'global-settings'
-      global-settings-type: cfp
-
-    publishers:
-      - email-notification:
-          email-prefix: '[hc2vpp]'
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-merge-{stream}-{os}'
     project-type: maven
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     jdk: openjdk8-{os}
 
     build-discarder:
@@ -176,9 +110,9 @@
       - os-parameter:
           os: '{os}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
 
@@ -201,7 +135,7 @@
           branch: '{branch}'
 
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge -Dsonar -Ddocs.hc.folder=io/fd/hc2vpp -Dmaven.site.skip={skip-site} site -Dmaven.site.deploy.skip={skip-site} site:deploy'
@@ -222,12 +156,12 @@
       - email-notification:
         email-prefix: '[hc2vpp]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-integration-{stream}-{os}'
     project-type: maven
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     jdk: openjdk8-{os}
 
     build-discarder:
@@ -244,9 +178,9 @@
       - stream-parameter:
           stream: '{stream}'
       - maven-project-parameter:
-          maven: 'mvn33-new'
+          maven: 'mvn36'
       - maven-exec:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
       - repo-name-parameter:
           repo-name: '{repo-stream-part}.{repo-os-part}'
       - string:
@@ -270,7 +204,7 @@
 
     triggers:
       - reverse:
-          jobs: 'vpp-merge-{stream}-{os},hc2vpp-merge-{stream}-{os}'
+          jobs: 'jvpp-merge-{stream}-{os},hc2vpp-merge-{stream}-{os}'
           result: 'success'
 
     prebuilders:
@@ -286,7 +220,7 @@
       - shell:
           !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh
     maven:
-      maven-name: 'mvn33-new'
+      maven-name: 'mvn36'
       root-pom: 'pom.xml'
       # yamllint disable-line rule:line-length
       goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge'
@@ -298,7 +232,7 @@
 
     postbuilders:
       - maven-target:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           goals: '--version'
           settings: 'hc2vpp-settings'
           settings-type: cfp
@@ -326,4 +260,13 @@
           deploy-unstable: false
           release-env-var: SKIP_JAR_DEPLOY
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
+
+- project:
+    name: hc2vpp-info
+    project-name: hc2vpp
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-4c-4g
+    project: hc2vpp
+    branch: master