diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/csit/csit-hc2vpp.yaml | 4 | ||||
-rw-r--r-- | jjb/csit/csit.yaml | 4 | ||||
-rw-r--r-- | jjb/hc2vpp/hc2vpp-csit.yaml | 26 | ||||
-rw-r--r-- | jjb/hc2vpp/hc2vpp.yaml | 26 | ||||
-rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 22 | ||||
-rw-r--r-- | jjb/jvpp/jvpp.yaml | 10 | ||||
-rw-r--r-- | jjb/vpp/vpp.yaml | 12 |
7 files changed, 57 insertions, 47 deletions
diff --git a/jjb/csit/csit-hc2vpp.yaml b/jjb/csit/csit-hc2vpp.yaml index e23c69454..00befec5d 100644 --- 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 52a21f069..15f728a4b 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -809,8 +809,6 @@ publishers: - email-ext: # yamllint disable-line rule:line-length - presend-script: "EMAIL_BODY = sh script: 'cat **/build-root/docs/deploy-site/src/site/resources/trending/_static/vpp/trending-failed-tests.txt, returnStdout: true'" - # yamllint disable-line rule:line-length recipients: 'tifrank@cisco.com, csit-report+int+616+181919729795594561@lists.fd.io' reply-to: '' content-type: 'text' @@ -819,7 +817,7 @@ body: | Following tests failed in the last trending job runs, listed per testbed type. - $EMAIL_BODY + ${{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 c03aab31f..c64a221a0 100644 --- 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 321026564..1195e266f 100644 --- 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 2ee68a2f9..a481c5769 100644 --- 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 42585ccd3..779ed7556 100644 --- 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.yaml b/jjb/vpp/vpp.yaml index 171d2a8dd..9c42fc25e 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -22,6 +22,9 @@ - '1901': branch: 'stable/1901' repo-stream-part: 'stable.1901' + - '1904': + branch: 'stable/1904' + repo-stream-part: 'stable.1904' - project: name: vpp-clang @@ -57,6 +60,9 @@ - '1901': branch: 'stable/1901' repo-stream-part: 'stable.1901' + - '1904': + branch: 'stable/1904' + repo-stream-part: 'stable.1904' os: ubuntu1604 - project: @@ -88,6 +94,9 @@ - '1901': branch: 'stable/1901' repo-stream-part: 'stable.1901' + - '1904': + branch: 'stable/1904' + repo-stream-part: 'stable.1904' os: - ubuntu1804: repo-os-part: 'ubuntu.bionic.main' @@ -105,6 +114,9 @@ - '1901': branch: 'stable/1901' repo-stream-part: 'stable.1901' + - '1904': + branch: 'stable/1904' + repo-stream-part: 'stable.1904' os: - ubuntu1804: repo-os-part: 'ubuntu-arm.bionic.main' |