CSIT: Convert jobs to ubuntu2004 part.I

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I5423091a9a45be430be8509786e27c6fea775b60

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 5ec40ab..c36ecee 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -17,14 +17,16 @@
     description: 'CSIT Jenkins jobs.'
 
     jobs:
-      - 'csit-docs-merge-{stream}'
+      - 'csit-docs-merge-{stream}-{os}-{executor-arch}'
       - 'csit-report-merge-{stream}'
       - 'csit-trending-daily-master'
       - 'csit-trending-weekly-2009-lts'
 
     project: 'csit'
     branch: 'master'
-    executor: 'ubuntu1804-us'
+    os:
+      - 'ubuntu2004'
+    executor-arch: 'x86_64'
     executor-large: 'ubuntu1804-l'
     build-artifact-num-to-keep: 10
     stream:
@@ -46,10 +48,10 @@
     project-name: csit
 
 - job-template:
-    name: 'csit-docs-merge-{stream}'
+    name: 'csit-docs-merge-{stream}-{os}-{executor-arch}'
 
     project-type: freestyle
-    node: '{executor}'
+    node: 'builder-{os}-prod-{executor-arch}'
     concurrent: true
     allow-empty: 'true'
     fingerprint: false