Merge "Remove all refs to nitrogen from int/dist"

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

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 3f92dc6c45305260c84a91ef9a2d9939e36341fe..59b60a8fd0b9b21bf80d269e9e18b5cf3e5bb1c3 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -2,8 +2,8 @@
 - project:
     name: nic-csit-basic
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'nic'
@@ -14,29 +14,14 @@
     # Project branches
     stream:
       - nitrogen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - beryllium:
-          branch: 'stable/beryllium'
-          jre: 'openjdk7'
-          karaf-version: karaf3
+          branch: 'stable/nitrogen'
 
     install:
-      - only:
-          scope: 'only'
       - all:
           scope: 'all'
 
     # Features to install
-    install-features: 'odl-nic-console'
+    install-features: 'odl-nic-intent-common'
 
     # Robot custom options
     robot-options: ''