From 9e3dbd533ae356f16a32ec47083de4f789fcfff2 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Mon, 18 Feb 2019 17:05:31 +0100 Subject: [PATCH] Support more testbeds in vpp perf job The downside is that triggers have to be different. Specifically, "perftest" cannot be an alias of "perftest-2n-skx", because it would also fire on "perftest-3n-skx". Change-Id: I4aa356ecb6702dfa86ff6af34a6773ab4006cfcb Signed-off-by: Vratko Polak --- jjb/vpp/vpp-macros.yaml | 2 +- jjb/vpp/vpp.yaml | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/jjb/vpp/vpp-macros.yaml b/jjb/vpp/vpp-macros.yaml index 36cf95922..185efe6df 100644 --- a/jjb/vpp/vpp-macros.yaml +++ b/jjb/vpp/vpp-macros.yaml @@ -46,7 +46,7 @@ server-name: 'Primary' trigger-on: - comment-added-contains-event: - comment-contains-value: 'perftest' + comment-contains-value: 'perftest-{node-arch}' projects: - project-compare-type: 'ANT' project-pattern: '{name}' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 5e8769a1e..a9fb10653 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -80,14 +80,18 @@ - project: name: vpp-perpatch jobs: - - 'vpp-csit-verify-perf-{stream}-2n-skx' - 'vpp-csit-verify-device-{stream}-1n-skx' + - 'vpp-csit-verify-perf-{stream}-{node-arch}' project: 'vpp' stream: - master: branch: 'master' repo-stream-part: 'master' os: ubuntu1804 + node-arch: + - 2n-skx + - 3n-skx + - 3n-hsw - project: name: vpp-master-only @@ -992,7 +996,7 @@ maven-version: 'mvn33-new' - job-template: - name: 'vpp-csit-verify-perf-{stream}-2n-skx' + name: 'vpp-csit-verify-perf-{stream}-{node-arch}' project-type: freestyle node: '{os}-us' @@ -1042,6 +1046,7 @@ - gerrit-trigger-csit-perftest: name: '{project}' branch: '{branch}' + node-arch: '{node-arch}' builders: - shell: -- 2.16.6