Switch the csit-1node to use job prefix

[releng/builder.git] / jjb / jsonrpc / jsonrpc-csit-basic.yaml

diff --git a/jjb/jsonrpc/jsonrpc-csit-basic.yaml b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
index 72f16bdce6338f395a7644b431f74aa622ea4ad7..5612eab04da57355a85b8f5e5637c380eae1fc5f 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -2,7 +2,7 @@
 - project:
     name: jsonrpc-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'jsonrpc'
@@ -15,29 +15,21 @@
 
     # Project branches
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
-          jre: 'openjdk8'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
-          jre: 'openjdk8'
           karaf-version: karaf3
           # yamllint disable-line rule:line-length
           bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-nitrogen/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.1.0-SNAPSHOT/jsonrpc-karaf-1.1.0-SNAPSHOT.zip'
-
       - carbon:
           branch: 'stable/carbon'
-          jre: 'openjdk8'
           karaf-version: karaf3
           # yamllint disable-line rule:line-length
           bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-carbon/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/1.0.0-SNAPSHOT/jsonrpc-karaf-1.0.0-SNAPSHOT.zip'
 
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-          # yamllint disable-line rule:line-length
-          bundleurl: 'https://jenkins.opendaylight.org/releng/view/jsonrpc/job/jsonrpc-merge-boron/lastSuccessfulBuild/org.opendaylight.jsonrpc$jsonrpc-karaf/artifact/org.opendaylight.jsonrpc/jsonrpc-karaf/0.9.0-SNAPSHOT/jsonrpc-karaf-0.9.0-SNAPSHOT.zip'
 
     install:
       - only: