X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopflex%2Fopflex.yaml;h=c3c7a6699b8b6b4c5a39f0c7ed8d8745d35f5750;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=9d617fc78b2b3e731abe34395f38e52cc5744740;hpb=4a98c0d9bf52be9bdbe5c6b5f06e1aa92564596f;p=releng%2Fbuilder.git

diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml
index 9d617fc78..c3c7a6699 100644
--- a/jjb/opflex/opflex.yaml
+++ b/jjb/opflex/opflex.yaml
@@ -5,20 +5,24 @@
       - 'opflex-release-{stream}'
 
     stream:
-      - nitrogen:
+      - fluorine:
           branch: 'master'
-          jdk: openjdk8
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: openjdk8
-      - boron:
-          branch: 'stable/boron'
-          jdk: openjdk8
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
+      - oxygen:
+          branch: 'stable/oxygen'
+          libuv-version: '1.8.0'
+          rapidjson-version: '1.0.2'
+          openvswitch-version: '2.6.0'
 
     project: 'opflex'
     project-name: 'opflex'
 
+    jdk: 'openjdk8'
+
     branch: master
+    build-timeout: 60
     global-settings-file: global-settings
     settings-file: opflex-settings
     group-id: org.opendaylight.opflex
@@ -27,63 +31,11 @@
     # Used by the release job
     staging-profile-id: 906b0d53d714e
 
-
-- builder:
-    name: opflex-deploy-maven-file
-    # Todo: Remove this builder when the generic version of the builder is
-    # available in global-jjb. Change no: 5753
-    # Deploy artifacts to a repository.
-    #
-    # The builder requires passing the following parameters
-    # REPO_ID:           Repository ID
-    # GROUP_ID:          Group ID of the repository
-    # UPLOAD_FILES_PATH: Path to directory containing one or more files
-    builders:
-      - lf-maven-install:
-          mvn-version: '{mvn-version}'
-      - lf-provide-maven-settings:
-          global-settings-file: '{global-settings-file}'
-          settings-file: '{settings-file}'
-      - inject:
-          properties-content: |
-              MAVEN_REPO_URL=file://$WORKSPACE/m2repo
-              REPO_ID={repo-id}
-              GROUP_ID={group-id}
-              UPLOAD_FILES_PATH={upload-files-dir}
-      - shell: !include-raw-escape:
-          - ../global-jjb/shell/lftools-install.sh
-          - ../global-jjb/shell/common-variables.sh
-          - deploy-opflex.sh
-
-- builder:
-    name: opflex-maven-stage
-    # Todo: Migrate to the generic version of the builders available in
-    # global-jjb. Change no: 5753
-    # Stage files to Nexus repository.
-    #
-    # The builder requires passing the following parameters
-    # REPO_ID             : Repository ID
-    # GROUP_ID            : Group ID of the repository
-    # UPLOAD_FILES_PATH   : Path to directory containing one or more files
-    # STAGING_PROFILE_ID  : Staging profile id created on Nexus
-    builders:
-      - lf-provide-maven-settings:
-          global-settings-file: '{global-settings-file}'
-          settings-file: '{settings-file}'
-      - lf-infra-create-netrc:
-          server-id: opendaylight-staging
-      - inject:
-          properties-content: |
-              STAGING_PROFILE_ID={staging-profile-id}
-      - shell: !include-raw-escape:
-          - ../global-jjb/shell/lftools-install.sh
-          - ../global-jjb/shell/maven-stage.sh
-
 - job-template:
     name: 'opflex-release-{stream}'
 
-    node: centos7-java-builder-2c-8g
-    jdk: '{jdk}'
+    node: centos7-builder-2c-8g
+    jdk: '{java-version}'
 
     ######################
     # Default parameters #
@@ -112,6 +64,21 @@
           mvn-params: '{mvn-params}'
           mvn-version: '{mvn-version}'
           staging-profile-id: '{staging-profile-id}'
+      - string:
+          name: LIBUV_VERSION
+          # yamllint disable-line rule:line-length
+          default: '{libuv-version}'
+          description: 'libuv version to pull from thirdparty repository'
+      - string:
+          name: RAPIDJSON_VERSION
+          # yamllint disable-line rule:line-length
+          default: '{rapidjson-version}'
+          description: 'rapidjson version to pull from thirdparty repository'
+      - string:
+          name: OPENVSWITCH_VERSION
+          # yamllint disable-line rule:line-length
+          default: '{openvswitch-version}'
+          description: 'openvswitch version to pull from thirdparty repository'
 
     scm:
       - gerrit-trigger-scm: