Merge "Enable docker build for cli"

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/ccsdk/storage-esaas.yaml b/jjb/ccsdk/storage-esaas.yaml
new file mode 100644 (file)
index 0000000..5c91767
--- /dev/null
+++ b/jjb/ccsdk/storage-esaas.yaml
@@ -0,0 +1,27 @@
+---
+- project:
+    name: ccsdk-storage-esaas
+    project-name: 'ccsdk-storage-esaas'
+    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: 'ccsdk/storage/esaas'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
+    mvn-settings: 'ccsdk-storage-esaas-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''

diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml
new file mode 100644 (file)
index 0000000..e24f67f
--- /dev/null
+++ b/jjb/ccsdk/storage-pgaas.yaml
@@ -0,0 +1,27 @@
+---
+- project:
+    name: ccsdk-storage-pgaas
+    project-name: 'ccsdk-storage-pgaas'
+    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: 'ccsdk/storage/pgaas'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'release-1.0.0':
+          branch: 'release-1.0.0'
+    mvn-settings: 'ccsdk-storage-pgaas-settings'
+    # due to a strange macro / variable translation problem this needs to be
+    # passed as a string block to properly get the properties correctly defined
+    # in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: '**'
+    archive-artifacts: ''

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 9070da0..d5b04fe 100644 (file)
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -5,10 +5,15 @@
     project-name: 'clamp'
     jobs:
       - '{project-name}-{stream}-verify-java-checkstyle'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-properties-java':
+         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 1d0be9d..d7685b9 100644 (file)
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -23,8 +23,6 @@
     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 580d65b..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'
@@ -770,6 +773,68 @@
       - infra-shiplogs:
           maven-version: '{maven-version}'
 
+- job-template:
+    # Job template for Java merge jobs based on
+    #   '{project-name}-{stream}-merge-java'
+    # The purpose of this job template is to run "maven clean deploy" for
+    # projects using this template.
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+    #     maven-properties: properties passed to maven
+    name: '{project-name}-{stream}-merge-properties-java'
+
+    project-type: freestyle
+    node: '{build-node}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+    builders:
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+      - maven-target:
+          maven-version: '{maven-version}'
+          goals: 'clean deploy -B
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+          properties: '{obj:mvn_properties}'
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'
+
 - job-template:
     # Job template for Java merge jobs that takes a maven template
     #

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/so/so-csit.yaml b/jjb/so/so-csit.yaml
new file mode 100644 (file)
index 0000000..5663566
--- /dev/null
+++ b/jjb/so/so-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: so-csit
+    jobs:
+      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-{stream}-csit-{functionality}'
+    project-name: 'so'
+    stream: 'master'
+    functionality:
+      - 'sanity-check':
+          trigger_jobs:
+            - 'so-master-docker-version-java-daily'
+    robot-options: ''
+    branch: 'master'

diff --git a/jjb/vfc/vfc-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-driver-svnfm-huawei.yaml
new file mode 100644 (file)
index 0000000..bf2ec6e
--- /dev/null
+++ b/jjb/vfc/vfc-driver-svnfm-huawei.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+    name: vfc-nfvo-driver-svnfm-Huawei
+    project-name: 'vfc-nfvo-driver-svnfm'
+    project: 'vfc/nfvo/driver/vnfm/svnfm'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-svnfm-settings'
+    subproject:
+      - 'drv-vnfm-huawei':
+          pom: 'huawei/vnfmadapter/pom.xml'
+          pattern: 'huawei/vnfmadapter/**'
+    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/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-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
new file mode 100644 (file)
index 0000000..5fec8cc
--- /dev/null
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+    name: vfc-gvnfm-vnfmgr-java
+    project-name: 'vfc-gvnfm-vnfmgr'
+    project: 'vfc/gvnfm/vnfmgr'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+    subproject:
+      - 'mgr':
+          pom: 'mgr/pom.xml'
+          pattern: 'mgr/**'
+    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-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-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 969373d..da8460d 100644 (file)
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -2,12 +2,12 @@
 
 - project:
     name: vfc-gvnfm-vnfres-java
-    project-name: 'vfc-gvnfm-vnfres-java'
+    project-name: 'vfc-gvnfm-vnfres'
     project: 'vfc/gvnfm/vnfres'
     stream:
       - 'master':
           branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfres-java-settings'
+    mvn-settings: 'vfc-gvnfm-vnfres-settings'
     subproject:
       - 'res':
           pom: 'res/pom.xml'

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-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
new file mode 100644 (file)
index 0000000..e8a5e84
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+    name: vfc-nfvo-driver-sfc
+    project-name: 'vfc-nfvo-driver-sfc'
+    project: 'vfc/nfvo/driver/sfc'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-sfc-settings'
+    subproject:
+      - 'driver-sfc-zte':
+          pom: 'zte/sfc-driver/pom.xml'
+          pattern: 'zte/sfc-driver/**'
+    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/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-driver-gvnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
similarity index 64%
rename from jjb/vfc/vfc-driver-gvnfm-python.yaml
rename to jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
index e3d4154..a1a7d23 100644 (file)
--- a/jjb/vfc/vfc-driver-gvnfm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
@@ -1,15 +1,13 @@
 ---
 
 - project:
-    name: vfc-nfvo-driver-gvnfm
-    project-name: 'vfc-nfvo-driver-gvnfm'
+    name: vfc-nfvo-driver-vnfm-gvnfm-python
+    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
     project: 'vfc/nfvo/driver/vnfm/gvnfm'
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-    mvn-settings: 'vfc-nfvo-driver-gvnfm-settings'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:
       - 'gvnfmadapter':

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-driver-svnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
similarity index 64%
rename from jjb/vfc/vfc-driver-svnfm-python.yaml
rename to jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
index 8c00776..79a3923 100644 (file)
--- a/jjb/vfc/vfc-driver-svnfm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml
@@ -1,15 +1,13 @@
 ---
 
 - project:
-    name: vfc-nfvo-driver-svnfm
-    project-name: 'vfc-nfvo-driver-svnfm'
+    name: vfc-nfvo-driver-vnfm-svnfm-zte-python
+    project-name: 'vfc-nfvo-driver-vnfm-svnfm'
     project: 'vfc/nfvo/driver/vnfm/svnfm'
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-    mvn-settings: 'vfc-nfvo-driver-svnfm-settings'
+    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     subproject:
       - 'drv-vnfm-zte':

diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index eae0259..b148c01 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -8,13 +8,9 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-lcm-settings'
-    subproject:
-      - 'lcm':
-          pom: 'lcm/pom.xml'
-          pattern: 'lcm/**'
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file

diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml
index 9293693..8ce9eb1 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml
@@ -8,10 +8,10 @@
       - 'master':
           branch: 'master'
     mvn-settings: 'vfc-nfvo-lcm-settings'
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-redis-4c-4g
     subproject:
       - 'lcm':
-          path: 'lcm'
-          pattern: 'lcm/**'
+          path: '.'
+          pattern: '**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'

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

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

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
new file mode 100644 (file)
index 0000000..11e2177
--- /dev/null
+++ b/packer/provision/redis.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+# This particular environment was created specifically for vfc-nfvo-lcm
+
+# vim: ts=4 sw=4 sts=4 et tw=72 :
+
+# force any errors to cause the script and job to end in failure
+set -xeu -o pipefail
+
+rh_systems() {
+    # redis
+    yum install redis
+    systemctl enable redis.service
+}
+
+ubuntu_systems() {
+    # redis
+
+    # 1. download and install redis
+    cd /tmp
+    wget http://download.redis.io/releases/redis-4.0.1.tar.gz
+    tar -zxf redis-4.0.1.tar.gz
+    cd /tmp/redis-4.0.1
+    make
+    make install
+
+    # 2. set conf file and init script
+    mv /tmp/redis-4.0.1/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
+
+    # 3. set auto start when start system
+    update-rc.d redis-server defaults
+}
+
+all_systems() {
+    echo 'No common distribution configuration to perform'
+}
+
+echo "---> Detecting OS"
+ORIGIN=$(facter operatingsystem | tr '[:upper:]' '[:lower:]')
+
+case "${ORIGIN}" in
+    fedora|centos|redhat)
+        echo "---> RH type system detected"
+        rh_systems
+    ;;
+    ubuntu)
+        echo "---> Ubuntu system detected"
+        ubuntu_systems
+    ;;
+    *)
+        echo "---> Unknown operating system"
+    ;;
+esac
+
+# execute steps for all systems
+all_systems

diff --git a/packer/templates/redis.json b/packer/templates/redis.json
new file mode 100644 (file)
index 0000000..7dee6fa
--- /dev/null
+++ b/packer/templates/redis.json
@@ -0,0 +1,54 @@
+{
+  "variables": {
+    "stack_tenant": null,
+    "stack_user": null,
+    "stack_pass": null,
+    "stack_network": null,
+    "base_image": null,
+    "cloud_user": null,
+    "distro": null,
+    "cloud_user_data": null
+  },
+  "builders": [
+    {
+      "type": "openstack",
+      "identity_endpoint": "https://auth.vexxhost.net/v2.0/",
+      "tenant_name": "{{user `stack_tenant`}}",
+      "username": "{{user `stack_user`}}",
+      "password": "{{user `stack_pass`}}",
+      "region": "ca-ymq-1",
+      "ssh_username": "{{user `cloud_user`}}",
+      "image_name": "{{user `distro`}} - redis - {{isotime \"20060102-1504\"}}",
+      "source_image_name": "{{user `base_image`}}",
+      "flavor": "v1-standard-1",
+      "availability_zone": "ca-ymq-2",
+      "networks": [
+        "{{user `stack_network`}}"
+      ],
+      "user_data_file": "{{user `cloud_user_data`}}"
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "inline": [
+        "mkdir -p /tmp/packer"
+      ]
+    },
+    {
+      "type": "file",
+      "source": "provision/basebuild/",
+      "destination": "/tmp/packer"
+    },
+    {
+      "type": "shell",
+      "scripts": [
+        "provision/baseline.sh",
+        "provision/basebuild.sh",
+        "provision/redis.sh",
+        "provision/system_reseal.sh"
+      ],
+      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    }
+  ]
+}