Remove .gitignore file that does nothing

[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 8b193474baa7636f40df090b408326450037dc23..1bec36cb0e0ba02a500e461baf6664d11a9b4dd9 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -1,16 +1,17 @@
 ---
 - project:
-    name: of-config-magnesium
+    name: of-config-aluminium
     jobs:
+      - gerrit-release-merge
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'of-config'
     project-name: 'of-config'
     branch: 'master'
     mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
     disable-job: true
@@ -19,36 +20,17 @@
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-sodium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: sodium
-    project: 'of-config'
-    project-name: 'of-config'
-    branch: 'stable/sodium'
-    mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: netconf-merge-{stream}'
-    email-upstream: '[of-config] [netconf]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: a6880455efe67
-
-- project:
-    name: of-config-neon
+    name: of-config-magnesium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/neon'
+    branch: 'stable/magnesium'
     mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
     disable-job: true
@@ -57,17 +39,17 @@
     staging-profile-id: a6880455efe67
 
 - project:
-    name: of-config-fluorine
+    name: of-config-sodium
     jobs:
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'of-config'
     project-name: 'of-config'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
     disable-job: true
@@ -83,8 +65,12 @@
     project-name: 'of-config'
     branch: 'master'
     mvn-settings: 'of-config-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: of-config-view