X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fhc2vpp%2Fhc2vpp.yaml;h=fe19c9b8464ebe1d31560e2564479871a0feef88;hb=c0bebffbd23b146587f9581b58ebab03f1b7c7a6;hp=e1d35914caaf6d73496855387b5ce3b92a3dfd3e;hpb=3d993af365039ffe5532921aaa1ff023b5c72c88;p=ci-management.git

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index e1d35914c..fe19c9b84 100644
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -1,302 +1,272 @@
+---
 - project:
     name: hc2vpp
     jobs:
-        - 'hc2vpp-verify-{stream}-{os}'
-        - 'hc2vpp-merge-{stream}-{os}'
-        - 'hc2vpp-integration-{stream}-{os}'
-        - 'hc2vpp-verify-image-{stream}-{os}'
+      - 'hc2vpp-verify-{stream}-{os}'
+      - 'hc2vpp-merge-{stream}-{os}'
+      - 'hc2vpp-integration-{stream}-{os}'
     project: 'hc2vpp'
     os:
-        - ubuntu1604:
-            repo-os-part: 'ubuntu.xenial.main'
-            skip-site: 'false'
-            skip-jar-deploy: 'false'
-        - centos7:
-            repo-os-part: 'centos7'
-            skip-site: 'true'
-            skip-jar-deploy: 'true'
+      - 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'
+          skip-jar-deploy: 'true'
     stream:
-        - master:
-            branch: 'master'
-            repo-stream-part: 'master'
-        - '1801':
-            branch: 'stable/1801'
-            repo-stream-part: 'stable.1801'
-        - '1804':
-            branch: 'stable/1804'
-            repo-stream-part: 'stable.1804'
-        - '1807':
-            branch: 'stable/1807'
-            repo-stream-part: 'stable.1807'
+      - master:
+          branch: 'master'
+          repo-stream-part: 'master'
+      - '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'
 
-- job-template:
-    name: 'hc2vpp-verify-{stream}-{os}'
-    project-type: maven
-    node: '{os}-basebuild-4c-4g'
-    concurrent: true
-    jdk: openjdk8-{os}
-
-    logrotate:
-        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-trigger-patch-submitted:
-            name: 'hc2vpp'
-            branch: '{branch}'
-
-    maven:
-        maven-name: 'mvn33-new'
-        root-pom: 'pom.xml'
-        goals: 'clean install -V -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -Dmerge site'
-        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'
+- project:
+    name: hc2vpp-view
+    views:
+      - project-view
+    project-name: hc2vpp
 
 - job-template:
-    name: 'hc2vpp-verify-image-{stream}-{os}'
+    name: 'hc2vpp-verify-{stream}-{os}'
     project-type: maven
-    node: '{os}-basebuild-4c-4g'
+    node: '{os}-builder-4c-4g'
     concurrent: true
     jdk: openjdk8-{os}
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    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}'
+      - 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'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
 
     wrappers:
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - 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
+      - gerrit-trigger-patch-submitted:
+          name: 'hc2vpp'
+          branch: '{branch}'
 
     maven:
-        maven-name: 'mvn33-new'
-        root-pom: 'pom.xml'
-        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
+      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'
+      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'
+      - email-notification:
+          email-prefix: '[hc2vpp]'
+      - fdio-infra-shiplogs:
+          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}
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    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}'
-        - 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}'
+      - project-parameter:
+          project: '{project}'
+      - os-parameter:
+          os: '{os}'
+      - maven-project-parameter:
+          maven: 'mvn36'
+      - maven-exec:
+          maven-version: 'mvn36'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            choosing-strategy: 'default'
+      - gerrit-trigger-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          choosing-strategy: 'default'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - ssh-agent-credentials:
+          users:
+            - 'jenkins-gerrit-credentials'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - gerrit-trigger-patch-merged:
-            name: 'hc2vpp'
-            branch: '{branch}'
+      - gerrit-trigger-patch-merged:
+          name: 'hc2vpp'
+          branch: '{branch}'
 
     maven:
-        maven-name: 'mvn33-new'
-        root-pom: 'pom.xml'
-        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'
-        maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
-        settings: 'hc2vpp-settings'
-        settings-type: cfp
-        global-settings: 'global-settings'
-        global-settings-type: cfp
+      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'
+      maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+      settings: 'hc2vpp-settings'
+      settings-type: cfp
+      global-settings: 'global-settings'
+      global-settings-type: cfp
 
     reporters:
-        - findbugs
+      - findbugs
 
     publishers:
-        - sonar:
-            jdk: 'openjdk8-{os}'
-            language: 'java'
-            branch: '{stream}'
-        - email-notification:
-            email-prefix: '[hc2vpp]'
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
+      - sonar:
+          jdk: 'openjdk8-{os}'
+          language: 'java'
+          branch: '{stream}'
+      - email-notification:
+        email-prefix: '[hc2vpp]'
+      - fdio-infra-shiplogs:
+          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}
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    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}'
-        - os-parameter:
-            os: '{os}'
-        - stream-parameter:
-            stream: '{stream}'
-        - maven-project-parameter:
-            maven: 'mvn33-new'
-        - maven-exec:
-            maven-version: 'mvn33-new'
-        - repo-name-parameter:
-            repo-name: '{repo-stream-part}.{repo-os-part}'
-        - string:
-            name: SKIP_JAR_DEPLOY
-            default: '{skip-jar-deploy}'
-            description: "Skips deployment of hc2vpp jars if variable is set to true"
+      - project-parameter:
+          project: '{project}'
+      - os-parameter:
+          os: '{os}'
+      - stream-parameter:
+          stream: '{stream}'
+      - maven-project-parameter:
+          maven: 'mvn36'
+      - maven-exec:
+          maven-version: 'mvn36'
+      - repo-name-parameter:
+          repo-name: '{repo-stream-part}.{repo-os-part}'
+      - string:
+          name: SKIP_JAR_DEPLOY
+          default: '{skip-jar-deploy}'
+          # yamllint disable-line rule:line-length
+          description: "Skips deployment of hc2vpp jars if variable is set to true"
 
     scm:
-        - git-scm:
-            credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
-            branch: '{branch}'
+      - git-scm:
+          credentials-id: 'jenkins-gerrit-credentials'
+          refspec: ''
+          branch: '{branch}'
 
     wrappers:
-        - ssh-agent-credentials:
-            users:
-                - 'jenkins-gerrit-credentials'
-        - fdio-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - ssh-agent-credentials:
+          users:
+            - 'jenkins-gerrit-credentials'
+      - fdio-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - reverse:
-            jobs: 'vpp-merge-{stream}-{os},hc2vpp-merge-{stream}-{os}'
-            result: 'success'
+      - reverse:
+          jobs: 'jvpp-merge-{stream}-{os},hc2vpp-merge-{stream}-{os}'
+          result: 'success'
 
     prebuilders:
-        - shell:
-            !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh
+      - config-file-provider:
+          files:
+            - file-id: '.packagecloud'
+              target: '/home/jenkins'
+      - config-file-provider:
+          files:
+            - file-id: 'packagecloud_api'
+              target: '/home/jenkins'
+
+      - shell:
+          !include-raw-escape: include-raw-hc2vpp-integration-prebuild.sh
     maven:
-        maven-name: 'mvn33-new'
-        root-pom: 'pom.xml'
-        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
+      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'
+      maven-opts: '-Xmx2048m -Dmaven.compile.fork=true'
+      settings: 'hc2vpp-settings'
+      settings-type: cfp
+      global-settings: 'global-settings'
+      global-settings-type: cfp
 
     postbuilders:
-        - maven-target:
-            maven-version: 'mvn33-new'
-            goals: '--version'
-            settings: 'hc2vpp-settings'
-            settings-type: cfp
-            global-settings: 'global-settings'
-            global-settings-type: cfp
-        - provide-maven-settings:
-            settings-file: 'hc2vpp-settings'
-            global-settings-file: 'global-settings'
-        - shell:
-            !include-raw-escape:
-                - ../scripts/maven_push_functions.sh
-                - include-raw-hc2vpp-pkg-push.sh
+      - maven-target:
+          maven-version: 'mvn36'
+          goals: '--version'
+          settings: 'hc2vpp-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+      - provide-maven-settings:
+          settings-file: 'hc2vpp-settings'
+          global-settings-file: 'global-settings'
+      - shell:
+          !include-raw-escape:
+          - ../scripts/maven_push_functions.sh
+          - include-raw-hc2vpp-pkg-push.sh
+      - shell:
+          !include-raw-escape:
+          - ../scripts/packagecloud_push.sh
     reporters:
-        - findbugs
+      - findbugs
 
     publishers:
-        - email-notification:
-            email-prefix: '[hc2vpp]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-            release-env-var: SKIP_JAR_DEPLOY
-        - fdio-infra-shiplogs:
-            maven-version: 'mvn33-new'
+      - email-notification:
+          email-prefix: '[hc2vpp]'
+      - maven-deploy:
+          id: ''
+          unique-version: true
+          deploy-unstable: false
+          release-env-var: SKIP_JAR_DEPLOY
+      - fdio-infra-shiplogs:
+          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