Fix csit-update job for nitrogen

[releng/builder.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index cc3063ae1920d5bcd5c9c8d595b7ff25b979df40..24e8d177fad75af91183099273e8ce362c392664 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -29,7 +29,6 @@
       - gbp
       - java-builder
       - mininet
-      - mininet-ovs-2.3
       - mininet-ovs-2.5
       - robot
 
@@ -38,8 +37,6 @@
         templates: gbp
       - platforms: centos
         templates: mininet
-      - platforms: centos
-        templates: mininet-ovs-2.3
       - platforms: centos
         templates: mininet-ovs-2.5
       - platforms: ubuntu-14.04
@@ -54,6 +51,8 @@
         templates: devstack
       - platforms: ubuntu-14.04
         templates: docker
+      - platforms: ubuntu-14.04
+        templates: mininet-ovs-2.5
       - platforms: ubuntu-16.04
         templates: java-builder
       - platforms: ubuntu-16.04
@@ -68,12 +67,8 @@
         templates: docker
       - platforms: ubuntu-16.04
         templates: mininet
-      - platforms: ubuntu-16.04
-        templates: mininet-ovs-2.3
       - platforms: ubuntu-16.04
         templates: gbp
-      - platforms: ubuntu-14.04
-        templates: mininet-ovs-2.5
 
 
     project-type: freestyle
@@ -570,6 +565,11 @@
     builders:
       - shell: |
           git checkout -b auto-update-csit-jobs
+      - integration-list-jobs:
+          blacklist: '{csit-list-blacklist}'
+          search_string: "csit"
+          stream: "nitrogen"
+          jobs-filename: "csit_jobs_nitrogen.lst"
       - integration-list-jobs:
           blacklist: '{csit-list-blacklist}'
           search_string: "csit"
@@ -585,9 +585,14 @@
           search_string: "csit"
           stream: "beryllium"
           jobs-filename: "csit_jobs_beryllium.lst"
+      - integration-replace-block-text:
+          starting-regex: "'csit-list-nitrogen: >'"
+          ending-regex: "'csit-list-carbon: >'"
+          file-with-changes-to-insert: "'csit_jobs_nitrogen.lst'"
+          file-to-change: "'jjb/releng-defaults.yaml'"
       - integration-replace-block-text:
           starting-regex: "'csit-list-carbon: >'"
-          ending-regex: "'csit-weekly-list-carbon: >'"
+          ending-regex: "'csit-list-boron: >'"
           file-with-changes-to-insert: "'csit_jobs_carbon.lst'"
           file-to-change: "'jjb/releng-defaults.yaml'"
       - integration-replace-block-text: