Merge "Update cloud image"

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

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 30f1487e2779165c04256b2e961e8fce2d3194d5..d7e136fcb1e292e93644904eda12212d231555e0 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,107 +1,65 @@
 ---
 - project:
-    name: l2switch-sodium
+    name: l2switch-master
     jobs:
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs
 
-    stream: sodium
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'master'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    disable-job: true
+    project: l2switch
+    project-name: l2switch
+    branch: master
+    stream: master
 
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
+    java-version: "openjdk11"
+    mvn-settings: "l2switch-settings"
+    mvn-version: mvn36
 
-- project:
-    name: l2switch-neon
-    jobs:
-      - odl-maven-jobs
-
-    stream: neon
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/neon'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    disable-job: true
+      odlparent-merge-{stream},
+      yangtools-merge-{stream},
+      controller-merge-{stream},
+      openflowjava-merge-{stream},
+      openflowplugin-merge-{stream}
+    email-upstream:
+      "[l2switch] [odlparent] [yangtools] [controller] [openflowjava]\
+      \ [openflowplugin]"
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
 
 - project:
-    name: l2switch-fluorine
+    name: l2switch-release-management
     jobs:
-      - odl-maven-jobs
+      - gerrit-release-merge
 
-    stream: fluorine
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/fluorine'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    disable-job: true
+    project: l2switch
+    project-name: l2switch
 
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
+    build-node: centos7-builder-2c-1g
+    mvn-settings: l2switch-settings
 
 - project:
-    name: l2switch-oxygen
+    name: l2switch-sonar
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'stable/oxygen'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    dependencies: >
-        odlparent-merge-{stream},
-        yangtools-merge-{stream},
-        controller-merge-{stream},
-        openflowjava-merge-{stream},
-        openflowplugin-merge-{stream}
-    email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
+      - gerrit-maven-sonar
+    project: "l2switch"
+    project-name: "l2switch"
+    branch: "master"
+    mvn-settings: "l2switch-settings"
+    mvn-opts: "-Xmx1024m"
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
-    name: l2switch-sonar
+    name: l2switch-info
     jobs:
-      - gerrit-maven-sonar
-    project: 'l2switch'
-    project-name: 'l2switch'
-    branch: 'master'
-    mvn-settings: 'l2switch-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
-    disable-job: true
+      - gerrit-info-yaml-verify
+    project: l2switch
+    project-name: l2switch
+    branch: master
+    build-node: centos7-builder-2c-1g
 
 - project:
     name: l2switch-view