Create Oxygen jobs and bump Nitrogen branch

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 887fd7bb4e6fc4574cfda8372c3af91177163b22..69e6be6a9e45416d0448df84fdce509f65443f6f 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -41,14 +41,16 @@
     templates:
       - devstack
       - devstack-pre-pip-newton:
-          build-timeout: 60
+          build-timeout: 75
       - devstack-pre-pip-ocata:
           build-timeout: 60
       - docker
       - gbp
-      - java-builder
+      - java-builder:
+          build-timeout: 75
       - mininet
-      - mininet-ovs-2.5
+      - mininet-ovs-2.5:
+          build-timeout: 60
       - robot
 
     exclude:
@@ -334,6 +336,11 @@
     builders:
       - shell: |
           git checkout -b auto-update-csit-jobs
+      - integration-list-jobs:
+          blacklist: '{csit-list-blacklist}'
+          search_string: "csit"
+          stream: "oxygen"
+          jobs-filename: "csit_jobs_oxygen.lst"
       - integration-list-jobs:
           blacklist: '{csit-list-blacklist}'
           search_string: "csit"
@@ -349,6 +356,11 @@
           search_string: "csit"
           stream: "boron"
           jobs-filename: "csit_jobs_boron.lst"
+      - integration-replace-block-text:
+          starting-regex: "'csit-list-oxygen: >'"
+          ending-regex: "'csit-list-nitrogen: >'"
+          file-with-changes-to-insert: "'csit_jobs_oxygen.lst'"
+          file-to-change: "'jjb/releng-defaults.yaml'"
       - integration-replace-block-text:
           starting-regex: "'csit-list-nitrogen: >'"
           ending-regex: "'csit-list-carbon: >'"