Merge "Skip SFT during mdsal-sonar"

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

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 640f4213bb1a0f764b86010499bcbcce2f8bbb26..ddca4e02dc2cd544cb1f787dbaa6660a087dc924 100644 (file)
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -10,18 +10,18 @@
       - 'opflex-release-{stream}'
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - fluorine:
-          branch: 'stable/fluorine'
+      - neon:
+          branch: 'stable/neon'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
-      - oxygen:
-          branch: 'stable/oxygen'
+      - fluorine:
+          branch: 'stable/fluorine'
           libuv-version: '1.8.0'
           rapidjson-version: '1.0.2'
           openvswitch-version: '2.6.0'
@@ -46,11 +46,13 @@
 
     node: centos7-builder-2c-8g
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     ######################
     # Default parameters #
     ######################
 
+    disable-job: false
     build-timeout: 30
     java-version: openjdk8
     mvn-opts: ''
@@ -100,6 +102,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - opflex-build:
           mvn33: '{mvn-version}'
           stream: '{stream}'
@@ -126,8 +129,8 @@
           email-prefix: '[opflex]'
       - lf-infra-publish
 
-- view:
-    name: opflex
-    description: 'List of opflex jobs'
-    regex: '^opflex-.*'
-    <<: *releng_view_common
+- project:
+    name: opflex-view
+    views:
+      - project-view
+    project-name: opflex