Switch the csit-verify-1node to use job prefix

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

diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml
index 6809f33798aa4803cf479b04b4d1accb926a6569..3da3c1efa30e53db7f133a00f5c2a5727bb8f0f7 100644 (file)
--- a/jjb/sfc/sfc.yaml
+++ b/jjb/sfc/sfc.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: 'sfc'
@@ -19,9 +18,11 @@
     mvn-settings: 'sfc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    build-timeout: 120
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -32,7 +33,6 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: nitrogen
     project: 'sfc'
@@ -49,6 +49,7 @@
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -59,7 +60,6 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
 
     stream: carbon
     project: 'sfc'
@@ -77,6 +77,7 @@
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
     archive-artifacts: ''
+    build-node: centos7-builder-4c-16g
 
     # Used by the release job
     staging-profile-id: a68eb361ca48a
@@ -84,7 +85,7 @@
 - project:
     name: sfc-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'sfc'
     project-name: 'sfc'
     branch: 'master'