Merge "Remove project cfg files as they are no longer used"

[releng/builder.git] / jjb / of-config / of-config.yaml

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index 3b5a13a1c6463f7eb372795635847bde9cd3d0f7..d3238fa893c69c3e570cf4beb7c58f710b8b1e93 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -2,15 +2,15 @@
 - project:
     name: of-config
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-merge-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-sonar'
-        - '{name}-validate-autorelease-{stream}'
-        - '{name}-verify-{stream}'
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-distribution-{stream}'
+        - '{project-name}-distribution-check-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-periodic-{stream}'
+        - '{project-name}-sonar'
+        - '{project-name}-validate-autorelease-{stream}'
+        - '{project-name}-verify-{stream}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
@@ -32,10 +32,10 @@
             disable_distribution_check: False
 
     project: 'of-config'
+    project-name: 'of-config'
     mvn-settings: 'of-config-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream},netconf-merge-{stream}'
-    email-upstream: '[of-config] [controller] [yangtools] [odlparent] [netconf]'
+    dependencies: netconf-merge-{stream}'
+    email-upstream: '[of-config] [netconf]'
     archive-artifacts: ''
-