Merge "Increase ocata packer timeout from 60m to 75m"

[releng/builder.git] / jjb / l2switch / l2switch.yaml

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 0b6745a59e4d197760367da0358525736359517d..f203d89595c71d0d66c102419fe58cad0e222e52 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'l2switch'
@@ -36,8 +35,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'l2switch'
@@ -68,8 +66,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'l2switch'