Merge "Update vfc-gvnfm-vnflcm yaml templete"
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
new file mode 100644
index 0000000..6ed9d2f
--- /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 0000000..3672b5a
--- /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/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 98375ec..9ca248c 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 --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