Merge "Modify vfc-gvnfm-vnfres java job yaml"

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/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-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-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..aa71564 100644 (file)
--- a/jjb/vfc/vfc-nfvo-lcm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml
@@ -11,7 +11,7 @@
     build-node: ubuntu1604-basebuild-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'