Merge "Update Java version & build node for Sonar jobs"

[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..baf34e8f9962f8a1761063d9b72e72e135ee7746 100644 (file)
--- a/jjb/jsonrpc/jsonrpc-csit-basic.yaml
+++ b/jjb/jsonrpc/jsonrpc-csit-basic.yaml
@@ -2,52 +2,35 @@
 - project:
     name: jsonrpc-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
-    project: 'jsonrpc'
+    project: "jsonrpc"
 
     # The functionality under test
-    functionality: 'basic'
-
-    # Set trigger
-    trigger-jobs: '{project}-merge-{stream}'
+    functionality: "basic"
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - 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'
+      - chlorine:
+          branch: "master"
+          jre: "openjdk17"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
 
     install:
       - only:
-          scope: 'only'
+          scope: "only"
 
     # no mininet required
     tools_system_count: 0
 
     # Features to install
-    install-features: 'odl-jsonrpc'
+    install-features: "odl-jsonrpc-all"
 
     # Robot custom options
-    robot-options: ''
+    robot-options: ""