summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-champ.yaml21
-rw-r--r--jjb/aai/aai-esr-gui.yaml21
-rw-r--r--jjb/aai/aai-esr-server.yaml21
-rw-r--r--jjb/ccsdk/distribution.yaml25
-rw-r--r--jjb/ci-management/ci-management.yaml1
-rw-r--r--jjb/clamp/clamp.yaml11
-rw-r--r--jjb/global-templates-java.yaml69
-rw-r--r--jjb/integration/integration-templates-csit.yaml8
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml19
-rw-r--r--jjb/multicloud/multicloud-framework-python.yaml16
-rw-r--r--jjb/policy/policy-api.yaml21
-rw-r--r--jjb/policy/policy-csit.yaml15
-rw-r--r--jjb/policy/policy-gui.yaml20
-rw-r--r--jjb/policy/policy-pap.yaml20
-rw-r--r--jjb/policy/policy-pdp.yaml20
-rw-r--r--jjb/so/so-csit.yaml14
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml20
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-python.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-python.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-ems-java.yaml20
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml20
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml (renamed from jjb/vfc/vfc-driver-gvnfm-python.yaml)8
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml20
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-python.yaml (renamed from jjb/vfc/vfc-driver-svnfm-python.yaml)8
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-python.yaml2
-rw-r--r--jjb/vnfsdk/vnfsdk-pkgtools-csit.yaml13
-rw-r--r--jjb/vnfsdk/vnfsdk-pkgtools-python.yaml17
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml13
29 files changed, 443 insertions, 26 deletions
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
new file mode 100644
index 000000000..666d79395
--- /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
index 000000000..f62a5a063
--- /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
index 000000000..762df8528
--- /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
index 000000000..5922c837f
--- /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 39d57188d..141731bc4 100644
--- 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 9070da0b6..d5b04fecb 100644
--- 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/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 580d65b36..21a227b27 100644
--- 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'
@@ -771,6 +774,68 @@
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
#
# The purpose of this job template is to run "maven clean deploy -P {x}"
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index f12bcfbec..4018309d9 100644
--- 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
index 000000000..4e2f160a7
--- /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
index 000000000..4fcad3e3d
--- /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/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
new file mode 100644
index 000000000..4e5abb1f2
--- /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
index 000000000..db3bdbfb9
--- /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
index 000000000..14f26ba1e
--- /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
index 000000000..71f1d103b
--- /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
index 000000000..37d6628c7
--- /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
index 000000000..566356652
--- /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-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
new file mode 100644
index 000000000..94a718f7c
--- /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 7730fbf3e..c4ed177f5 100644
--- 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 6961d9386..9de9b0fea 100644
--- 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 947923a99..db7762f3e 100644
--- 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
index 000000000..e1a555446
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -0,0 +1,20 @@
+---
+
+- project:
+ name: vfc-nfvo-driver-ems-java
+ project-name: 'vfc-nfvo-driver-ems'
+ project: 'vfc/nfvo/driver/ems'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-ems-settings'
+ subproject:
+ - 'ems-driver-boco':
+ pom: 'ems/ems/sems/boco/ems-driver/pom.xml'
+ pattern: 'ems/ems/sems/boco/ems-driver/**'
+ 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-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
new file mode 100644
index 000000000..22c8704a9
--- /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
index e3d415438..a1a7d236d 100644
--- 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
index 000000000..23a611774
--- /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
index 8c0077622..79a392337 100644
--- 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-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml
index aa7156439..8ce9eb181 100644
--- 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
index 000000000..93cbf9fc9
--- /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
index 000000000..f480dcf53
--- /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
index 000000000..666f5ab41
--- /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'