diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-03-12 16:10:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2021-03-12 16:10:54 +0000 |
| commit | f84cb71ecedce21edf1961ee2ad4fd4380c5bc37 (patch) | |
| tree | 180c23695745d5c6a98f8e0f26baeab7aa0e1bd9 /jjb | |
| parent | 39b3138645405cb7527d229f70540041d6f1ec3e (diff) | |
| parent | fd0ca724c180fdc4be48d3788e2acddf6c9dd89e (diff) | |
Merge "CSIT: Convert jobs to ubuntu2004 part.IV"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit.yaml | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index c36eceea..75da7df5 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: |