summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml22
-rw-r--r--jjb/dmaap/dmaap-messagerouter-messageservice.yaml22
-rw-r--r--jjb/integration/include-raw-integration-install-robotframework.sh5
-rwxr-xr-xjjb/vfc/build-gvnfm-vnflcm-docker-image.sh11
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml5
-rw-r--r--jjb/vfc/vfc-nfvo-driver-svnfm-huawei-csit.yaml15
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml3
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement-csit.yaml14
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml3
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml2
10 files changed, 100 insertions, 2 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/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/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
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei-csit.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei-csit.yaml
new file mode 100644
index 000000000..23243c299
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei-csit.yaml
@@ -0,0 +1,15 @@
+---
+
+- project:
+ name: vfc-nfvo-driver-svnfm-huawei-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'vfc-nfvo-driver-svnfm'
+ stream: 'master'
+ functionality:
+ - 'sanity-check':
+ trigger_jobs:
+ - 'vfc-nfvo-driver-svnfm-huawei-master-docker-version-java-daily'
+ robot-options: ''
+ branch: 'master' \ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 22c8704a9..0d57efa2d 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -15,6 +15,9 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-docker-version-java-daily':
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
new file mode 100644
index 000000000..c3c89d8ec
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-resmanagement-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: vfc-nfvo-resmanagement-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'vfc-nfvo-resmanagement'
+ stream: 'master'
+ functionality:
+ - 'sanity-check':
+ trigger_jobs:
+ - 'vfc-nfvo-resmanagement-master-docker-version-java-daily'
+ robot-options: ''
+ branch: 'master' \ No newline at end of file
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 1f364da27..2bf363c3c 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -14,3 +14,6 @@
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-docker-version-java-daily':
+ docker-pom: 'pom.xml'
+ mvn-profile: 'docker'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 28e25c6d0..02de1a340 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -11,7 +11,7 @@
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-aai-docker-java-daily':
- pom: 'deployment/docker/pom.xml'
+ pom: 'vnfmarket-be/deployment/docker/pom.xml'
mvn-goals: 'docker:build'
docker-image-name: 'onap/refrepo'