Merge "Add jjb def for missing heartbeat service"

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index a8eaefd..ad9b0d5 100644 (file)
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -19,3 +19,15 @@
     mvn-settings: 'aai-search-data-service-settings'
     files: '**'
     archive-artifacts: ''
+- project:
+    name: aai-search-data-service-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-basebuild-4c-4g
+    project: 'aai/search-data-service'
+    project-name: 'aai-search-data-service'
+    branch: 'master'
+    mvn-settings: 'aai-search-data-service'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index e3625ad..21abd7f 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -12,10 +12,9 @@
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
           disabled: true
-      - '{project-name}-{stream}-aai-docker-java-version-daily':
-          pom: 'aai-traversal/pom.xml'
-          mvn-goals: 'docker:build docker:push'
-          disabled: true
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'aai-traversal/pom.xml'
+          mvn-profile: 'docker'
 
     project: 'aai/traversal'
     stream:

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 591b886..d06314e 100644 (file)
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -1,4 +1,5 @@
 ---
+
 - project:
     name: dmaap-buscontroller
     project-name: 'dmaap-buscontroller'
@@ -10,7 +11,12 @@
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
-          mvn-goals: 'clean install'
+          mvn-goals: 'clean install docker:build'
+      - '{project-name}-{stream}-docker-java-daily':
+          docker-pom: 'pom.xml'
+          mvn-profile: 'docker'
+          mvn-goals: 'clean install docker:build'
+          build-node: ubuntu1604-docker-8c-8g
     project: 'dmaap/buscontroller'
     stream:
       - 'master':

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 7ec69c6..9de47bf 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -31,7 +31,7 @@
         -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 
     # Timeout in minutes
-    build-timeout: 360
+    build-timeout: 90
     build-node: ubuntu1604-basebuild-2c-1g
 
     archive-artifacts: ''

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index ce1dcf0..9260ea9 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -12,6 +12,10 @@
           path: 'newton'
           pattern: 'newton/**'
           pom: 'newton/pom.xml'
+      - 'newton_share':
+          path: 'newton'
+          pattern: 'share/**'
+          pom: 'newton/pom.xml'
       - 'ocata':
           path: 'ocata'
           pattern: 'ocata/**'
@@ -39,14 +43,42 @@
     archive-artifacts: ''
     build-node: 'ubuntu1604-memcached-4c-4g'
 - project:
-    name: multicloud-openstack-sonar
+    name: multicloud-openstack-newton-sonar
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
     build-node: ubuntu1604-basebuild-4c-4g
     project: 'multicloud/openstack'
-    project-name: 'multicloud-openstack'
+    project-name: 'multicloud-openstack-newton'
+    branch: 'master'
+    mvn-params: '-f newton/pom.xml'
+    mvn-settings: 'multicloud-openstack-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+- project:
+    name: multicloud-openstack-ocata-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-basebuild-4c-4g
+    project: 'multicloud/openstack'
+    project-name: 'multicloud-openstack-ocata'
+    branch: 'master'
+    mvn-params: '-f ocata/pom.xml'
+    mvn-settings: 'multicloud-openstack-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+- project:
+    name: multicloud-openstack-windriver-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-basebuild-4c-4g
+    project: 'multicloud/openstack'
+    project-name: 'multicloud-openstack-windriver'
     branch: 'master'
+    mvn-params: '-f windriver/pom.xml'
     mvn-settings: 'multicloud-openstack-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+

diff --git a/jjb/music/music-csit.yaml b/jjb/music/music-csit.yaml
new file mode 100644 (file)
index 0000000..7172e7a
--- /dev/null
+++ b/jjb/music/music-csit.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+     name: music-csit
+     jobs:
+       - '{project-name}-{stream}-verify-csit-{functionality}'
+       - '{project-name}-{stream}-csit-{functionality}'
+     project-name: 'music'
+     stream: 'master'
+     functionality:
+       - 'music-test-plan':
+           trigger_jobs:
+             - 'music-master-docker-version-java-daily'
+     robot-options: ''
+     branch: 'master'
+
+

diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml
new file mode 100644 (file)
index 0000000..4413b14
--- /dev/null
+++ b/jjb/optf/optf-has-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+     name: optf-has-csit
+     jobs:
+       - '{project-name}-{stream}-verify-csit-{functionality}'
+       - '{project-name}-{stream}-csit-{functionality}'
+     project-name: 'optf-has'
+     stream: 'master'
+     functionality:
+       - 'has':
+           trigger_jobs:
+             - 'optf-has-master-conductor-docker-java-version-shell-daily'
+     robot-options: ''
+     branch: 'master'

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index e664f6e..fb76042 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -7,9 +7,6 @@
       - '{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: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
 
     project: 'policy/common'
     stream:

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index bdbfd49..ccf078e 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -8,9 +8,6 @@
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
           disabled: true
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
 
     project: 'policy/drools-applications'
     stream:

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 920e1eb..3fc8f57 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -6,11 +6,6 @@
       - gerrit-maven-clm:
           mvn-params: '-DskipTests'
       - '{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: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-scm-mvn-script':
           mvn-goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index e379e4b..a8a9a17 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -6,11 +6,6 @@
       - gerrit-maven-clm:
           build-timeout: 30
       - '{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: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
       - '{project-name}-{stream}-merge-scm-mvn-script':
           mvn-goals: 'clean deploy -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'

diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
index 36a76a9..d729cb1 100755 (executable)
--- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
+++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh
@@ -5,15 +5,19 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
+echo '============== BUILDING ZTE IMAGE ================='
 chmod 755 ./zte/vmanager/docker/*.*
 ./zte/vmanager/docker/build_image.sh
 
+echo '============== BUILDING HUAWEI IMAGE ================='
 chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.*
 ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
 
+echo '============== BUILDING NOKIA V1 IMAGE ================='
 chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.*
 ./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
 
-cd nokiav2/deployment
-mvn package -Dexec.args="buildDocker pushImage"
+echo '============== BUILDING NOKIA V2 IMAGE ================='
+chmod 755 ./nokiav2/deployment/src/main/resources/*.sh
+./nokiav2/deployment/src/main/resources/build_image.sh buildDocker pushImage
 

diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 14325d5..8681013 100644 (file)
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -29,6 +29,32 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-wfengine-wfenginemgrservice-sonar
+    jobs:
+      - gerrit-maven-sonar
+    mvn-params: '-f wfenginemgrservice/pom.xml'
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-basebuild-4c-4g
+    project: 'vfc/nfvo/wfengine'
+    project-name: 'vfc-nfvo-wfengine-wfenginemgrservice'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-wfengine-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+- project:
+    name: vfc-nfvo-wfengine-activiti-extension-sonar
+    jobs:
+      - gerrit-maven-sonar
+    mvn-params: '-f activiti-extension/pom.xml'
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-basebuild-4c-4g
+    project: 'vfc/nfvo/wfengine'
+    project-name: 'vfc-nfvo-wfengine-activiti-extension'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-wfengine-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 - project:
     name: vfc-nfvo-wfengine-sonar
     jobs:

diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index e457db9..f8eb213 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -3,15 +3,34 @@
     name: vnfsdk-ice
     project-name: 'vnfsdk-ice'
     project: 'vnfsdk/ice'
+    pom: 'pom.xml'
     stream:
       - 'master':
           branch: 'master'
     subproject:
-      - ice:
-          path: '.'
-          pattern: '**'
+      - 'scripts':
+          path: 'validation-scripts'
+          pattern: 'validation-scripts/**'
+          pom: 'validation-scripts/pom.xml'
+      - 'server':
+          path: 'ice-server'
+          pattern: 'ice-server/**'
+          pom: 'ice-server/pom.xml'
     mvn-settings: 'vnfsdk-ice-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     jobs:
       - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+- project:
+    name: vnfsdk-ice-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-basebuild-4c-4g
+    project: 'vnfsdk/ice'
+    project-name: 'vnfsdk-ice'
+    branch: 'master'
+    mvn-settings: 'vnfsdk-ice-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index aef9f2d..a313f9b 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -25,11 +25,11 @@
     jobs:
       - gerrit-maven-sonar
     cron: 'H 11 * * *'
-    mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
     build-node: ubuntu1604-basebuild-4c-4g
     project: 'vnfsdk/ves-agent'
     project-name: 'vnfsdk-ves-agent'
     branch: 'master'
+    mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
     mvn-settings: 'vnfsdk-ves-agent-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'