Merge "Create new stream stable 1904 for sweetcomb"

diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml
index e23c694..00befec 100644 (file)
--- a/jjb/csit/csit-hc2vpp.yaml
+++ b/jjb/csit/csit-hc2vpp.yaml
@@ -81,7 +81,7 @@
           output-path: 'archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'csit-hc2vpp-verify-perf-{stream}-{os}'
@@ -138,4 +138,4 @@
           output-path: 'archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index d1dd4bd..15f728a 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -817,7 +817,7 @@
           body: |
                 Following tests failed in the last trending job runs, listed per testbed type.
 
-                ${{FILE,path="resources/tools/presentation/_build/_static/vpp/trending-failed-tests.txt"}}
+                ${{FILE,path="build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/trending-failed-tests.txt"}}
 
           always: true
           failure: false

diff --git a/jjb/hc2vpp/hc2vpp-csit.yaml b/jjb/hc2vpp/hc2vpp-csit.yaml
index c03aab3..c64a221 100644 (file)
--- a/jjb/hc2vpp/hc2vpp-csit.yaml
+++ b/jjb/hc2vpp/hc2vpp-csit.yaml
@@ -29,7 +29,7 @@
       - ubuntu1604:
           repo-os-part: 'ubuntu.xenial.main'
 
-    odl: 'fluorine'
+    odl: 'neon'
 
 - project:
     name: csit-hc2vpp-perf
@@ -49,7 +49,7 @@
       - ubuntu1604:
           repo-os-part: 'ubuntu.xenial.main'
 
-    odl: 'fluorine'
+    odl: 'neon'
 
 - job-template:
     name: 'hc2vpp-csit-integration-{stream}-{os}'
@@ -101,7 +101,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-verify-{stream}-{os}'
@@ -125,9 +125,9 @@
       - 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}'
       - odl-parameter:
@@ -169,7 +169,7 @@
           !include-raw-escape: include-raw-hc2vpp-csit-verify-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 -DskipTests -Dcheckstyle.skip=true'
@@ -194,7 +194,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-integration-odl-{odl}-{stream}-{os}'
@@ -248,7 +248,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-verify-odl-{odl}-{stream}-{os}'
@@ -272,9 +272,9 @@
       - 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}'
       - odl-parameter:
@@ -316,7 +316,7 @@
           !include-raw-escape: include-raw-hc2vpp-csit-verify-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 -DskipTests -Dcheckstyle.skip=true'
@@ -341,7 +341,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-csit-perf-{stream}-{os}'
@@ -410,7 +410,7 @@
           output-path: 'csit/archive'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - parameter:
     name: odl-parameter

diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml
index 3210265..1195e26 100644 (file)
--- a/jjb/hc2vpp/hc2vpp.yaml
+++ b/jjb/hc2vpp/hc2vpp.yaml
@@ -77,7 +77,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'
@@ -91,7 +91,7 @@
       - email-notification:
           email-prefix: '[hc2vpp]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-verify-image-{stream}-{os}'
@@ -143,7 +143,7 @@
             notbuilt: true
 
     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'
@@ -157,7 +157,7 @@
       - email-notification:
           email-prefix: '[hc2vpp]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-merge-{stream}-{os}'
@@ -177,9 +177,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}'
 
@@ -202,7 +202,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'
@@ -223,7 +223,7 @@
       - email-notification:
         email-prefix: '[hc2vpp]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'hc2vpp-integration-{stream}-{os}'
@@ -245,9 +245,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:
@@ -287,7 +287,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'
@@ -299,7 +299,7 @@
 
     postbuilders:
       - maven-target:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           goals: '--version'
           settings: 'hc2vpp-settings'
           settings-type: cfp
@@ -327,4 +327,4 @@
           deploy-unstable: false
           release-env-var: SKIP_JAR_DEPLOY
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'

diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml
index 2ee68a2..a481c57 100644 (file)
--- a/jjb/honeycomb/honeycomb.yaml
+++ b/jjb/honeycomb/honeycomb.yaml
@@ -69,7 +69,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'
@@ -83,7 +83,7 @@
       - email-notification:
           email-prefix: '[honeycomb]'
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'honeycomb-merge-{stream}-{os}'
@@ -103,9 +103,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}'
 
@@ -128,7 +128,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 site site:deploy'
@@ -140,7 +140,7 @@
 
     postbuilders:
       - maven-target:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           goals: '--version'
           settings: 'honeycomb-settings'
           settings-type: cfp
@@ -165,7 +165,7 @@
           unique-version: true
           deploy-unstable: false
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
 
 - job-template:
     name: 'honeycomb-benchmark-master-{os}'
@@ -185,9 +185,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: 'master.{repo-os-part}'
 
@@ -207,7 +207,7 @@
       - timed: '@daily'
 
     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 -Pbenchmark'
@@ -282,4 +282,4 @@
                 exclude: 'simple-container,list-in-container,complex-list-in-container'
 
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'

diff --git a/jjb/jvpp/jvpp.yaml b/jjb/jvpp/jvpp.yaml
index 42585cc..779ed75 100644 (file)
--- a/jjb/jvpp/jvpp.yaml
+++ b/jjb/jvpp/jvpp.yaml
@@ -89,7 +89,7 @@
           only-if-success: true
           default-excludes: false
       - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           archive-artifacts: '/tmp/jvpp-failed-unittests/*/* **/core'
       - naginator:
           rerun-unstable-builds: false
@@ -118,9 +118,9 @@
       - 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:
@@ -154,7 +154,7 @@
             - file-id: 'packagecloud_api'
               target: '/root'
       - maven-target:
-          maven-version: 'mvn33-new'
+          maven-version: 'mvn36'
           goals: '--version'
           settings: 'jvpp-settings'
           settings-type: cfp
@@ -185,7 +185,7 @@
           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

diff --git a/jjb/vpp/vpp-opensuse.yaml b/jjb/vpp/vpp-opensuse.yaml
deleted file mode 100644 (file)
index 3b92ecb..0000000
--- a/jjb/vpp/vpp-opensuse.yaml
+++ /dev/null
@@ -1,177 +0,0 @@
----
-
-- project:
-    name: osleap15
-    jobs:
-      - 'vpp-verify-{stream}-osleap15'
-      - 'vpp-merge-{stream}-osleap15'
-
-    project: 'vpp'
-    os: 'opensuse'
-    repo-os-part: 'opensuse'
-
-    stream:
-      - 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'
-
-- job-template:
-    name: 'vpp-verify-{stream}-osleap15'
-
-    project-type: freestyle
-    node: 'osleap15-us'
-    concurrent: true
-
-    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: 'opensuse'
-      - repo-name-parameter:
-          repo-name: '{repo-stream-part}.opensuse'
-      - stream-parameter:
-          stream: '{stream}'
-
-    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-checkstyle:
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
-      - shell:
-          !include-raw-escape:
-          - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-build.sh
-
-    publishers:
-      - archive:
-          artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-          archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 2
-          fixed-delay: 90
-
-- job-template:
-    name: 'vpp-merge-{stream}-osleap15'
-
-    project-type: freestyle
-    node: 'osleap15-us'
-
-    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: 'opensuse'
-      - maven-project-parameter:
-          maven: 'mvn33-new'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - stream-parameter:
-          stream: '{stream}'
-      - repo-name-parameter:
-          repo-name: '{repo-stream-part}.opensuse'
-
-    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: 'vpp-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - shell:
-          !include-raw-escape: include-raw-vpp-checkstyle.sh
-      - shell:
-          !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh
-      - shell:
-          !include-raw-escape:
-          - ../scripts/setup_vpp_dpdk_dev_env.sh
-          - include-raw-vpp-build.sh
-      - provide-maven-settings:
-          settings-file: 'vpp-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-vpp-maven-push.sh
-
-    publishers:
-      - archive:
-          artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb'
-          allow-empty: 'true'
-          fingerprint: false
-          only-if-success: true
-          default-excludes: false
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-      - naginator:
-          rerun-unstable-builds: false
-          max-failed-builds: 1
-          fixed-delay: 90