Move VIRL jobs to ondemand

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

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 5c8743e..2f1dc85 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -17,40 +17,37 @@
     description: 'CSIT Jenkins jobs.'
 
     jobs:
-      - 'csit-docs-verify-{stream}'
       - 'csit-docs-merge-{stream_timed}'
       - 'csit-report-merge-{stream}'
-      - 'csit-report-merge-1901_2'
-      - 'csit-report-merge-1904_1'
+      - 'csit-report-merge-1901_3'
+      - 'csit-report-merge-1904_2'
       - 'csit-trending-daily-master'
 
     project: 'csit'
     branch: 'master'
     executor: 'ubuntu1804-us'
+    executor-large: 'ubuntu1804-l'
     build-artifact-num-to-keep: 10
     stream_timed:
       - master:
           branch: 'master'
           executor: 'ubuntu1804-us'
-      - '1904':
-          branch: 'rls1904'
+      - '1908':
+          branch: 'rls1908'
           executor: 'ubuntu1804-us'
     stream:
       - master:
           branch: 'master'
           executor: 'ubuntu1804-us'
-      - '1807':
-          branch: 'rls1807'
-          executor: 'ubuntu1604-basebuild-4c-4g'
-      - '1810':
-          branch: 'rls1810'
-          executor: 'ubuntu1604-basebuild-4c-4g'
       - '1901':
           branch: 'rls1901'
           executor: 'ubuntu1604-basebuild-4c-4g'
       - '1904':
           branch: 'rls1904'
           executor: 'ubuntu1804-us'
+      - '1908':
+          branch: 'rls1908'
+          executor: 'ubuntu1804-us'
 
 - project:
     name: csit-view
@@ -58,77 +55,12 @@
       - project-view
     project-name: csit
 
-
-- job-template:
-    name: 'csit-docs-verify-{stream}'
-
-    project-type: freestyle
-    node: '{executor}'
-    concurrent: true
-    archive-artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
-    allow-empty: 'true'
-    fingerprint: false
-    only-if-success: true
-    default-excludes: false
-
-    build-discarder:
-      daysToKeep: '{build-days-to-keep}'
-      numToKeep: '{build-num-to-keep}'
-      artifactDaysToKeep: '{build-artifact-days-to-keep}'
-      artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-      - gerrit-parameter:
-          branch: '{branch}'
-      - maven-exec:
-          maven-version: 'mvn33-new'
-      - string:
-          name: ARCHIVE_ARTIFACTS
-          default: '{archive-artifacts}'
-          description: Artifacts to archive to the logs server.
-
-    scm:
-      - gerrit-trigger-scm:
-          credentials-id: 'jenkins-gerrit-credentials'
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - fdio-infra-wrappers-non-activity-timeout:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - maven-target:
-          maven-version: 'mvn33-new'
-          goals: '--version'
-          settings: 'csit-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - provide-maven-settings:
-          settings-file: 'csit-settings'
-          global-settings-file: 'global-settings'
-      - shell:
-          !include-raw-escape: include-raw-csit-docs.sh
-
-    publishers:
-      - fdio-infra-shiplogs:
-          maven-version: 'mvn33-new'
-
 - job-template:
     name: 'csit-docs-merge-{stream_timed}'
 
     project-type: freestyle
     node: '{executor}'
     concurrent: true
-    archive-artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz'
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
@@ -205,9 +137,8 @@
     name: 'csit-report-merge-{stream}'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-8c-32g'
+    node: '{executor-large}'
     concurrent: false
-    archive-artifacts: 'resources/tools/presentation/csit.report.tar.gz'
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
@@ -278,12 +209,11 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-report-merge-1901_2'
+    name: 'csit-report-merge-1901_3'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-8c-32g'
+    node: '{executor-large}'
     concurrent: false
-    archive-artifacts: 'resources/tools/presentation/csit.report.tar.gz'
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
@@ -299,7 +229,7 @@
       - project-parameter:
           project: '{project}'
       - gerrit-parameter:
-          branch: 'rls1901_2'
+          branch: 'rls1901_3'
       - maven-exec:
           maven-version: 'mvn33-new'
       - string:
@@ -328,7 +258,7 @@
               project-pattern: '{project}'
               branches:
                 - branch-compare-type: 'ANT'
-                  branch-pattern: '**/rls1901_2'
+                  branch-pattern: '**/rls1901_3'
           skip-vote:
             successful: true
             failed: true
@@ -354,12 +284,11 @@
           maven-version: 'mvn33-new'
 
 - job-template:
-    name: 'csit-report-merge-1904_1'
+    name: 'csit-report-merge-1904_2'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-8c-32g'
+    node: '{executor-large}'
     concurrent: false
-    archive-artifacts: 'resources/tools/presentation/csit.report.tar.gz'
     allow-empty: 'true'
     fingerprint: false
     only-if-success: true
@@ -375,7 +304,7 @@
       - project-parameter:
           project: '{project}'
       - gerrit-parameter:
-          branch: 'rls1904_1'
+          branch: 'rls1904_2'
       - maven-exec:
           maven-version: 'mvn33-new'
       - string:
@@ -404,7 +333,7 @@
               project-pattern: '{project}'
               branches:
                 - branch-compare-type: 'ANT'
-                  branch-pattern: '**/rls1904_1'
+                  branch-pattern: '**/rls1904_2'
           skip-vote:
             successful: true
             failed: true
@@ -433,7 +362,7 @@
     name: 'csit-trending-daily-master'
 
     project-type: freestyle
-    node: 'ubuntu1604-basebuild-8c-32g'
+    node: '{executor-large}'
     concurrent: false
 
     build-discarder: