11 files changed, 129 insertions, 32 deletions
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
new file mode 100644
index 000000000..6ed9d2f62
--- /dev/null
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+    name: dmaap-messagerouter-dmaapclient
+    project-name: 'dmaap-messagerouter-dmaapclient'
+    jobs:
+      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'dmaap/dmaapclient/pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/messagerouter/dmaapclient'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
+    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+    files: '**'
+    archive-artifacts: ''
+\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
new file mode 100644
index 000000000..3672b5a27
--- /dev/null
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+    name: dmaap-messagerouter-messageservice
+    project-name: 'dmaap-messagerouter-messageservice'
+    jobs:
+      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'dmaap/messageservice/pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/messagerouter/messageservice'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    files: '**'
+    archive-artifacts: ''
+\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
new file mode 100644
index 000000000..20dbd21f6
--- /dev/null
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+    name: dmaap-messagerouter-mirroragent
+    project-name: 'dmaap-messagerouter-mirroragent'
+    jobs:
+      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'dmaap/mirroragent/pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/messagerouter/mirroragent'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
+    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+    files: '**'
+    archive-artifacts: ''
+\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
new file mode 100644
index 000000000..f5e8c109c
--- /dev/null
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+    name: dmaap-messagerouter-msgrtr
+    project-name: 'dmaap-messagerouter-msgrtr'
+    jobs:
+      - '{project-name}-{stream}-clm'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'dmaap/msgrtr/pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/messagerouter/msgrtr'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
+    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
+    files: '**'
+    archive-artifacts: ''
+\ No newline at end of file
diff --git a/jjb/dmaap/dmaap-messagerouter.yaml b/jjb/dmaap/dmaap-messagerouter.yaml
deleted file mode 100644
index a0c806e00..000000000
--- a/jjb/dmaap/dmaap-messagerouter.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- project:
-    name: dmaap-messagerouter
-    project-name: 'dmaap-messagerouter'
-    project: 'dmaap/messagerouter'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-settings'
-    subproject:
-      - 'Msgrtr':
-          pom: 'Msgrtr/pom.xml'
-          pattern: 'Msgrtr/**'
-          mvn-goals: 'clean install'
-      - 'dmaap':
-          pom: 'dmaap/pom.xml'
-          pattern: 'dmaap/**'
-          mvn-goals: 'clean install'
-      - 'dmaapClient':
-          pom: 'dmaapClient/pom.xml'
-          pattern: 'dmaapClient/**'
-          mvn-goals: 'clean install'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-    files: '**'
-    archive-artifacts: ''
-\ No newline at end of file
diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 98375ec1b..9ca248c7d 100644
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -20,7 +20,10 @@ pip install --upgrade pip
 
 pip install --upgrade --no-binary pycparser pycparser
 pip install --upgrade pyOpenSSL==16.2.0 docker-py importlib requests scapy netifaces netaddr ipaddr simplejson demjson
-pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library}}
+pip install --upgrade robotframework{,-{httplibrary,requests,sshlibrary,selenium2library,xvfb}}
+
+pip install xvfbwrapper
+pip install PyVirtualDisplay
 
 # Print installed versions.
 pip freeze
diff --git a/jjb/multicloud/multicloud-csit.yaml b/jjb/multicloud/multicloud-csit.yaml
index 44a69f548..770df5417 100644
--- a/jjb/multicloud/multicloud-csit.yaml
+++ b/jjb/multicloud/multicloud-csit.yaml
@@ -4,10 +4,10 @@
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'multicloud-framework'
+    project-name: 'multicloud'
     stream: 'master'
     functionality:
-      - 'provision':
+      - 'functionality1':
           trigger_jobs:
             - '{project-name}-{stream}-multivimbroker-merge-java'
     robot-options: ''
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index fa1911233..1fa18a702 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -11,10 +11,11 @@
       - 'newton':
           path: 'newton'
           pattern: 'newton/**'
+          pom: 'newton/pom.xml'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
     files: '**'
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'
diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
new file mode 100644
index 000000000..4e57d7667
--- /dev/null
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -0,0 +1,16 @@
+---
+
+- project:
+    name: usecase-ui
+    project-name: 'usecase-ui'
+    project: 'usecase-ui'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'usecase-ui-settings'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/build-gvnfm-vnflcm-docker-image.sh b/jjb/vfc/build-gvnfm-vnflcm-docker-image.sh
new file mode 100755
index 000000000..d570d18a2
--- /dev/null
+++ b/jjb/vfc/build-gvnfm-vnflcm-docker-image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./docker/*.*
+
+./docker/build_image.sh
+
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 94a718f7c..e751d4855 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -15,6 +15,11 @@
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'lcm/pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
 \ No newline at end of file