Merge "Chore: Move to ubuntu2004-docker"

[ci-management.git] / jjb / testsuite / testsuite.yaml

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 4a8d9c9..0ea7129 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -24,28 +24,13 @@
 
     project: 'testsuite'
 
-    extra-project1: 'testsuite/python-testing-utils'
-    extra-branch1: '{branch}'
-    extra-refspec1: 'refs/heads/{branch}'
-    checkout-dir1: 'testsuite/eteutils'
-
-    extra-project2: 'testsuite/heatbridge'
-    extra-branch2: '{branch}'
-    extra-refspec2: 'refs/heads/{branch}'
-    checkout-dir2: 'testsuite/heatbridge'
-
-    extra-project3: 'demo'
-    extra-branch3: '{branch}'
-    extra-refspec3: 'refs/heads/{branch}'
-    checkout-dir3: 'demo'
-
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
-      - 'elalto':
-          branch: 'elalto'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'testsuite-settings'
 
 - project:
@@ -63,13 +48,16 @@
     project-name: 'testsuite'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint':
-          build-node: ubuntu1804-builder-4c-4g
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'
           tox-envs: 'yaml'
-          pattern: '**/*.yaml|**/*.yml'
+          pattern: '**/*.yaml'
+      - 'yml':
+          tox-dir: '.'
+          tox-envs: 'yaml'
+          pattern: '**/*.yml'
       - 'json':
           tox-dir: '.'
           tox-envs: 'json'
@@ -77,7 +65,11 @@
       - 'robot':
           tox-dir: '.'
           tox-envs: 'robot'
-          pattern: '**/*.robot'
+          pattern: 'robot/testsuites/usecases/*.robot'
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'