Fix packaging tox-verify to run only master

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

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 9eaae4f43670e7913febafc23a1cd092eddd21a8..8613b63ac81bc81ae91a016af117d6802302dfcc 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -5,7 +5,6 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: oxygen
     project: 'unimgr'
@@ -22,7 +21,7 @@
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
@@ -33,7 +32,6 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: nitrogen
     project: 'unimgr'
@@ -50,7 +48,7 @@
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
@@ -61,7 +59,6 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: carbon
     project: 'unimgr'
@@ -79,7 +76,7 @@
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     archive-artifacts: ''
-    build-node: centos7-java-builder-4c-16g
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51