From fd0ca724c180fdc4be48d3788e2acddf6c9dd89e Mon Sep 17 00:00:00 2001 From: pmikus Date: Thu, 11 Mar 2021 10:57:05 +0000 Subject: CSIT: Convert jobs to ubuntu2004 part.IV Signed-off-by: pmikus Change-Id: I69e2393dafe129fa9effd6ce10f6b1ac34616860 --- jjb/csit/csit.yaml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'jjb') diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index c36eceea3..75da7df52 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -18,16 +18,15 @@ jobs: - 'csit-docs-merge-{stream}-{os}-{executor-arch}' - - 'csit-report-merge-{stream}' - - 'csit-trending-daily-master' - - 'csit-trending-weekly-2009-lts' + - 'csit-report-merge-{stream}-{os}-{executor-arch}' + - 'csit-trending-daily-master-{os}-{executor-arch}' + - 'csit-trending-weekly-2009-lts-{os}-{executor-arch}' project: 'csit' branch: 'master' os: - 'ubuntu2004' executor-arch: 'x86_64' - executor-large: 'ubuntu1804-l' build-artifact-num-to-keep: 10 stream: - master: @@ -130,10 +129,10 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-report-merge-{stream}' + name: 'csit-report-merge-{stream}-{os}-{executor-arch}' project-type: freestyle - node: '{executor-large}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: false allow-empty: 'true' fingerprint: false @@ -209,10 +208,10 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-trending-daily-master' + name: 'csit-trending-daily-master-{os}-{executor-arch}' project-type: freestyle - node: '{executor-large}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: false build-discarder: @@ -310,10 +309,10 @@ maven-version: 'mvn33-new' - job-template: - name: 'csit-trending-weekly-2009-lts' + name: 'csit-trending-weekly-2009-lts-{os}-{executor-arch}' project-type: freestyle - node: '{executor-large}' + node: 'builder-{os}-prod-{executor-arch}' concurrent: false build-discarder: -- cgit 1.2.3-korg