summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/ccsdk/storage-esaas.yaml27
-rw-r--r--jjb/ccsdk/storage-pgaas.yaml27
-rw-r--r--jjb/clamp/clamp.yaml5
-rw-r--r--jjb/global-templates-java.yaml62
-rw-r--r--jjb/vfc/vfc-driver-svnfm-huawei.yaml19
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml19
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml4
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml19
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-java.yaml8
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-python.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-lctest-csit.yaml13
-rw-r--r--jjb/vnfsdk/vnfsdk-lctest.yaml13
12 files changed, 209 insertions, 11 deletions
diff --git a/jjb/ccsdk/storage-esaas.yaml b/jjb/ccsdk/storage-esaas.yaml
new file mode 100644
index 000000000..5c91767aa
--- /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
index 000000000..e24f67fd2
--- /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/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index 9070da0b6..1004a2c9c 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -5,7 +5,10 @@
project-name: 'clamp'
jobs:
- '{project-name}-{stream}-verify-java-checkstyle'
- - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-merge-properties-java':
+ maven-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
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 580d65b36..c5803dcb8 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -771,6 +771,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: '{maven-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/vfc/vfc-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-driver-svnfm-huawei.yaml
new file mode 100644
index 000000000..bf2ec6e43
--- /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
index 000000000..5fec8ccd4
--- /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-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 969373d63..da8460d62 100644
--- 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-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
new file mode 100644
index 000000000..e8a5e8461
--- /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-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index eae0259b0..b148c01a2 100644
--- 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 92936932b..aa7156439 100644
--- 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
index 000000000..954cb35f5
--- /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
index 000000000..9a7e2a19d
--- /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'