Merge "Jenkins job to build MSB API Gateway docker"

diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
new file mode 100644 (file)
index 0000000..666d793
--- /dev/null
+++ b/jjb/aai/aai-champ.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: aai-champ
+    project-name: 'aai-champ'
+    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: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'aai/champ'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-champ-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
new file mode 100644 (file)
index 0000000..f62a5a0
--- /dev/null
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: aai-esr-gui
+    project-name: 'aai-esr-gui'
+    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: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'aai/esr-gui'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-esr-gui-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
new file mode 100644 (file)
index 0000000..762df85
--- /dev/null
+++ b/jjb/aai/aai-esr-server.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: aai-esr-server
+    project-name: 'aai-esr-server'
+    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: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'aai/esr-server'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'aai-esr-server-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
new file mode 100644 (file)
index 0000000..5922c83
--- /dev/null
+++ b/jjb/ccsdk/distribution.yaml
@@ -0,0 +1,25 @@
+---
+- project:
+    name: ccsdk-distribution
+    project-name: 'ccsdk-distribution'
+    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}-docker-java-daily'
+      - '{project-name}-{stream}-docker-version-java-daily'
+      - '{project-name}-docker-image-blessing'
+
+    project: 'ccsdk/distribution'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
+    mvn-settings: 'ccsdk-distribution-settings'
+    files: '**'
+    archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: docker
+    build-node: ubuntu1604-docker-8c-8g

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 39d5718..141731b 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -19,6 +19,7 @@
     templates:
       - basebuild
       - docker
+      - redis
 
     exclude:
       # only build the docker image on ubuntu at present

diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 1004a2c..d5b04fe 100644 (file)
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -6,12 +6,14 @@
     jobs:
       - '{project-name}-{stream}-verify-java-checkstyle'
       - '{project-name}-{stream}-merge-properties-java':
-         maven-properties: |
-          docker.pull.registry=nexus3.onap.org:10001
-          docker.push.registry=nexus3.onap.org:10003
+         mvn_properties:
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
       - '{project-name}-{stream}-release-java-daily-checkstyle':
-         maven-deploy-properties: |
-          skipDockerBuild
+         mvn_properties:
+          - skipDockerBuild=true
+          - skipDockerTag=true
+          - skipDockerPush=true
       - '{project-name}-{stream}-docker-java-properties-daily':
          docker-pom: 'pom.xml'
          mvn-profile: 'docker'

diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 66e707b..d7685b9 100644 (file)
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -11,13 +11,18 @@
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-version-java-daily':
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
+         maven-properties: |
+          skip.docker.build=false
+          skip.docker.tag=false
+          skip.docker.push=false
 
     project: 'cli'
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'cli-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index c5803dc..21a227b 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -423,6 +423,8 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
+          java-opts:
+            - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -479,8 +481,7 @@
           maven-version: '{maven-version}'
           goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          properties:
-            - '{maven-deploy-properties}'
+          properties: '{obj:mvn_properties}'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -701,6 +702,8 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           properties:
             - '{maven-deploy-properties}'
+          java-opts:
+            - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: 'global-settings'
@@ -826,7 +829,7 @@
           settings-type: cfp
           global-settings: 'global-settings'
           global-settings-type: cfp
-          properties: '{maven-properties}'
+          properties: '{obj:mvn_properties}'
 
     publishers:
       - infra-shiplogs:

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

diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml
index 46400d8..f795f32 100644 (file)
--- a/jjb/holmes/holmes-dsa.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -6,10 +6,6 @@
       - '{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: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
 
     project: 'holmes/dsa'
     stream:

diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 74d2ce5..3b18f85 100644 (file)
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -6,10 +6,6 @@
       - '{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: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
 
     project: 'holmes/engine-management'
     stream:

diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index d719402..01f553c 100644 (file)
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -6,10 +6,6 @@
       - '{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: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
 
     project: 'holmes/rule-management'
     stream:

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index f12bcfb..4018309 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -9,12 +9,12 @@
 
     properties:
       - lf-infra-properties:
-          project: '{project-name}'
+          project: 'integration'
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
       - infra-parameters:
-          project: '{project-name}'
+          project: 'integration'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
@@ -63,12 +63,12 @@
 
     properties:
       - lf-infra-properties:
-          project: '{project-name}'
+          project: 'integration'
           build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
       - infra-parameters:
-          project: '{project-name}'
+          project: 'integration'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
new file mode 100644 (file)
index 0000000..4e2f160
--- /dev/null
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+    name: multicloud-framework-java
+    project-name: 'multicloud-framework'
+    project: 'multicloud/framework'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-framework-settings'
+    subproject:
+      - 'multivimbroker':
+          pom: 'multivimbroker/pom.xml'
+          pattern: 'multivimbroker/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml
new file mode 100644 (file)
index 0000000..4fcad3e
--- /dev/null
+++ b/jjb/multicloud/multicloud-framework-python.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+    name: multicloud-framework-python
+    project-name: 'multicloud-framework'
+    project: 'multicloud/framework'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-framework-settings'
+    build-node: 'ubuntu1604-basebuild-4c-4g'
+    subproject:
+      - 'multivimbroker':
+          path: 'multivimbroker'
+          pattern: 'multivimbroker/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
new file mode 100644 (file)
index 0000000..d60aba3
--- /dev/null
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+    name: multicloud-openstack-vmware-java
+    project-name: 'multicloud-openstack-vmware'
+    project: 'multicloud/openstack/vmware'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-openstack-vmware-settings'
+    subproject:
+      - 'vio':
+          pom: 'vio/pom.xml'
+          pattern: 'vio/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
new file mode 100644 (file)
index 0000000..62e52f2
--- /dev/null
+++ b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+    name: multicloud-openstack-vmware-python
+    project-name: 'multicloud-openstack-vmware'
+    project: 'multicloud/openstack/vmware'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'multicloud-openstack-vmware-settings'
+    build-node: 'ubuntu1604-basebuild-4c-4g'
+    subproject:
+      - 'vio':
+          path: 'vio'
+          pattern: 'vio/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
new file mode 100644 (file)
index 0000000..4e5abb1
--- /dev/null
+++ b/jjb/policy/policy-api.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: policy-api
+    project-name: 'policy-api'
+    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: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'policy/api'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-api-settings'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
new file mode 100644 (file)
index 0000000..db3bdbf
--- /dev/null
+++ b/jjb/policy/policy-csit.yaml
@@ -0,0 +1,15 @@
+- project:
+    name: policy-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'policy'
+    stream: 'master'
+    functionality:
+      - 'health':
+          trigger_jobs:
+            - 'policy-engine-{stream}-merge-java'
+            - 'policy-drools-pdp-{stream}-merge-java'
+            - 'policy-drools-applications-{stream}-merge-java'
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
new file mode 100644 (file)
index 0000000..14f26ba
--- /dev/null
+++ b/jjb/policy/policy-gui.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+    name: policy-gui
+    project-name: 'policy-gui'
+    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: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'policy/gui'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-gui-settings'
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
new file mode 100644 (file)
index 0000000..71f1d10
--- /dev/null
+++ b/jjb/policy/policy-pap.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+    name: policy-pap
+    project-name: 'policy-pap'
+    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: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'policy/pap'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-pap-settings'
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
new file mode 100644 (file)
index 0000000..37d6628
--- /dev/null
+++ b/jjb/policy/policy-pdp.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+    name: policy-pdp
+    project-name: 'policy-pdp'
+    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: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+
+    project: 'policy/pdp'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'policy-pdp-settings'
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/portal/portal-sdk.yaml b/jjb/portal/portal-sdk.yaml
index 24935b1..6839543 100644 (file)
--- a/jjb/portal/portal-sdk.yaml
+++ b/jjb/portal/portal-sdk.yaml
@@ -22,3 +22,4 @@
     mvn-settings: 'portal-sdk-settings'
     files: '**'
     archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g

diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
new file mode 100644 (file)
index 0000000..94a718f
--- /dev/null
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -0,0 +1,20 @@
+---
+
+- project:
+    name: vfc-gvnfm-vnflcm-java
+    project-name: 'vfc-gvnfm-vnflcm'
+    project: 'vfc/gvnfm/vnflcm'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnflcm-settings'
+    subproject:
+      - 'lcm':
+          pom: 'lcm/pom.xml'
+          pattern: 'lcm/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file

diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
index 7730fbf..c4ed177 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'vfc-gvnfm-vnflcm-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:

diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
index 6961d93..9de9b0f 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:

diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
index 947923a..db7762f 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'vfc-gvnfm-vnfres-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:

diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
new file mode 100644 (file)
index 0000000..e1a5554
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -0,0 +1,20 @@
+---\r
+\r
+- project:\r
+    name: vfc-nfvo-driver-ems-java\r
+    project-name: 'vfc-nfvo-driver-ems'\r
+    project: 'vfc/nfvo/driver/ems'\r
+    stream:\r
+      - 'master':\r
+          branch: 'master'\r
+    mvn-settings: 'vfc-nfvo-driver-ems-settings'\r
+    subproject:\r
+      - 'ems-driver-boco':\r
+          pom: 'ems/ems/sems/boco/ems-driver/pom.xml'\r
+          pattern: 'ems/ems/sems/boco/ems-driver/**'\r
+    jobs:\r
+      - '{project-name}-{stream}-{subproject}-verify-java'\r
+      - '{project-name}-{stream}-{subproject}-merge-java'\r
+    files: '**'\r
+    archive-artifacts: ''\r
+    build-node: ubuntu1604-basebuild-4c-4g
\ 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
new file mode 100644 (file)
index 0000000..22c8704
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -0,0 +1,20 @@
+---
+
+- project:
+    name: vfc-nfvo-driver-vnfm-gvnfm-java
+    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+    project: 'vfc/nfvo/driver/vnfm/gvnfm'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+    subproject:
+      - 'gvnfmadapter':
+          pom: 'gvnfmadapter/pom.xml'
+          pattern: 'gvnfmadapter/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
index 5a662aa..a1a7d23 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
new file mode 100644 (file)
index 0000000..23a6117
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -0,0 +1,20 @@
+---
+
+- project:
+    name: vfc-nfvo-driver-vnfm-svnfm-zte-java
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm'
+    project: 'vfc/nfvo/driver/vnfm/svnfm'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+    subproject:
+      - 'drv-vnfm-zte':
+          pom: 'zte/vmanager/pom.xml'
+          pattern: 'zte/vmanager/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file

diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
index 603902b..79a3923 100644 (file)
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
@@ -7,8 +7,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:

diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml
index aa71564..8ce9eb1 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml
@@ -8,7 +8,7 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-lcm-settings'
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-redis-4c-4g
     subproject:
       - 'lcm':
           path: '.'

diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml
new file mode 100644 (file)
index 0000000..93cbf9f
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+    name: vnfsdk-pkgtools-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'vnfsdk-pkgtools'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
new file mode 100644 (file)
index 0000000..f480dcf
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -0,0 +1,17 @@
+---
+
+- project:
+    name: vnfsdk-pkgtools
+    project-name: 'vnfsdk-pkgtools'
+    subproject:
+      - pkgtools:
+          path: '.'
+          pattern: '**'
+    project: 'vnfsdk/pkgtools'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vnfsdk-pkgtools-settings'
+    build-node: ubuntu1604-basebuild-4c-4g
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
new file mode 100644 (file)
index 0000000..666f5ab
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+    name: vnfsdk-refrepo
+    project: 'vnfsdk/refrepo'
+    jobs:
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+
+    project-name: 'vnfsdk-refrepo'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vnfsdk-refrepo-settings'

diff --git a/packer/provision/redis.sh b/packer/provision/redis.sh
index 11e2177..c940c0a 100644 (file)
--- a/packer/provision/redis.sh
+++ b/packer/provision/redis.sh
@@ -8,7 +8,7 @@ set -xeu -o pipefail
 
 rh_systems() {
     # redis
-    yum install redis
+    yum install -y redis
     systemctl enable redis.service
 }
 
@@ -24,9 +24,9 @@ ubuntu_systems() {
     make install
 
     # 2. set conf file and init script
-    mv /tmp/redis-4.0.1/redis-server /etc/init.d/redis-server
+    cp /tmp/redis-4.0.1/src/redis-server /etc/init.d/redis-server
     chmod +x /etc/init.d/redis-server
-    mv /tmp/redis-4.0.1/redis.conf /etc/redis.conf
+    cp /tmp/redis-4.0.1/redis.conf /etc/redis.conf
 
     # 3. set auto start when start system
     update-rc.d redis-server defaults