Merge "Add csit job for armoury"

diff --git a/jjb/armoury/armoury.cfg b/jjb/armoury/armoury.cfg
index 7e2aed2084047774b0022d13420408a48dceba18..0fe575d55eaecd141618beadb131b5c57eabf247 100644 (file)
--- a/jjb/armoury/armoury.cfg
+++ b/jjb/armoury/armoury.cfg
@@ -2,11 +2,5 @@ STREAMS:
 - beryllium:
     branch: master
     jdks: openjdk7
-- stable-lithium:
-    branch: stable/lithium
-    jdks: openjdk7
-- stable-helium:
-    branch: stable/helium
-    jdks: openjdk7
 MVN_OPTS: -Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,mdsal

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 9b2d23e9930a15022a78418f024ecbd3468fa913..3840296bffe4d91425e99b3e7bb2317ba6a05ebf 100644 (file)
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -23,16 +23,6 @@
             jdk: openjdk7
             jdks:
                 - openjdk7
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-        - stable-helium:
-            branch: 'stable/helium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
 
     project: 'armoury'
 

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 5239832e4facea49b817b61610c59a57dfdc2eed..78cae49c5a714d7711ddc4b11d11f54867f91dc0 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -15,7 +15,11 @@ echo ROBOT_VENV=${ROBOT_VENV} >> ${WORKSPACE}/env.properties
 
 virtualenv ${ROBOT_VENV}
 source ${ROBOT_VENV}/bin/activate
-pip install -q docker-py importlib requests scapy netifaces netaddr ipaddr jsonpath
+pip install -q --upgrade pip
+pip --version
+pip install -q docker-py importlib requests scapy netifaces netaddr ipaddr
 pip install -q robotframework{,-{httplibrary,requests,sshlibrary}}
+# jsonpath is needed by current AAA idmlite suite
+pip install -q --allow-external jsonpath --allow-unverified jsonpath jsonpath
 
 # vim: sw=4 ts=4 sts=4 et ft=sh :

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
new file mode 100644 (file)
index 0000000..2879053
--- /dev/null
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -0,0 +1,31 @@
+- project:
+    name: unimgr-csit-basic
+    jobs:
+        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
+
+    # The project name
+    project: 'unimgr'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Project branches
+    stream:
+        - beryllium:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-unimgr'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},ovsdb-distribution-{stream},unimgr-distribution-{stream}'