summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/cli/cli.yaml11
-rw-r--r--jjb/dmaap/dmaap-buscontroller.yaml10
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml9
-rw-r--r--jjb/dmaap/dmaap-dbcapi.yaml10
-rw-r--r--jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml10
-rw-r--r--jjb/dmaap/dmaap-messagerouter-docker.yaml11
-rw-r--r--jjb/dmaap/dmaap-messagerouter-messageservice.yaml10
-rw-r--r--jjb/dmaap/dmaap-messagerouter-mirroragent.yaml10
-rw-r--r--jjb/dmaap/dmaap-messagerouter-msgrtr.yaml10
-rw-r--r--jjb/global-templates-c.yaml2
-rw-r--r--jjb/global-templates-docker.yaml14
-rw-r--r--jjb/global-templates-golang.yaml5
-rw-r--r--jjb/global-templates-helm.yaml6
-rw-r--r--jjb/global-templates-java.yaml25
-rw-r--r--jjb/global-templates-python.yaml2
-rw-r--r--jjb/global-templates-script.yaml5
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml10
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml10
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml10
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml10
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml10
-rw-r--r--jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml10
-rw-r--r--jjb/logging-analytics/logging-analytics.yaml10
-rw-r--r--jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml13
-rw-r--r--jjb/modeling/modeling-toscaparsers-nfvparser.yaml12
-rw-r--r--jjb/multicloud/multicloud-azure-csit.yaml13
-rw-r--r--jjb/multicloud/multicloud-azure-java.yaml10
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml10
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-java.yaml10
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml11
-rw-r--r--jjb/optf/optf-cmso.yaml3
-rw-r--r--jjb/policy/policy-apex-pdp.yaml10
-rw-r--r--jjb/policy/policy-api.yaml10
-rw-r--r--jjb/policy/policy-common.yaml10
-rw-r--r--jjb/policy/policy-core.yaml10
-rw-r--r--jjb/policy/policy-distribution.yaml10
-rw-r--r--jjb/policy/policy-drools-applications.yaml10
-rw-r--r--jjb/policy/policy-drools-pdp.yaml12
-rw-r--r--jjb/policy/policy-engine.yaml12
-rw-r--r--jjb/policy/policy-gui.yaml10
-rw-r--r--jjb/policy/policy-models.yaml10
-rw-r--r--jjb/policy/policy-pap.yaml10
-rw-r--r--jjb/policy/policy-parent.yaml10
-rw-r--r--jjb/policy/policy-pdp.yaml10
-rw-r--r--jjb/policy/policy-xacml-pdp.yaml10
-rw-r--r--jjb/portal/portal.yaml10
-rw-r--r--jjb/so/so-libs.yaml10
-rw-r--r--jjb/so/so.yaml11
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-java.yaml11
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml11
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml11
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml11
-rw-r--r--jjb/vfc/vfc-nfvo-driver-ems-java.yaml11
-rw-r--r--jjb/vfc/vfc-nfvo-driver-sfc.yaml11
-rw-r--r--jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml13
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml11
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml13
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml13
-rw-r--r--jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml13
-rw-r--r--jjb/vfc/vfc-nfvo-lcm-java.yaml11
-rw-r--r--jjb/vfc/vfc-nfvo-multivimproxy.yaml11
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml11
-rw-r--r--jjb/vfc/vfc-nfvo-wfengine-java.yaml11
-rw-r--r--jjb/vid/vid.yaml11
-rw-r--r--jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml11
-rw-r--r--jjb/vnfsdk/vnfsdk-functest.yaml11
-rw-r--r--jjb/vnfsdk/vnfsdk-ice-python.yaml11
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml11
-rw-r--r--jjb/vnfsdk/vnfsdk-validation.yaml11
-rw-r--r--jjb/vnfsdk/vnfsdk-ves-agent.yaml13
70 files changed, 650 insertions, 79 deletions
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 87b03b4eb..8522709bc 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -4,7 +4,6 @@
name: cli
project-name: 'cli'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -34,3 +33,13 @@
mvn-settings: 'cli-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: cli-clm
+ jobs:
+ - gerrit-maven-clm
+ project: 'cli'
+ project-name: 'cli'
+ branch: 'master'
+ mvn-settings: 'cli-settings'
+ build-node: ubuntu1604-builder-4c-4g
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 2af0e8d96..21077e660 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -4,7 +4,6 @@
name: dmaap-buscontroller
project-name: 'dmaap-buscontroller'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -29,3 +28,12 @@
# removed sonar job from this template because this repo only builds a docker container
# and the 0% coverage report from Sonar was causing repeated escalations.
+
+- project:
+ name: dmaap-buscontroller-clm
+ jobs:
+ - gerrit-maven-clm
+ project: dmaap/buscontroller
+ project-name: 'dmaap-buscontroller'
+ branch: 'master'
+ mvn-settings: 'dmaap-buscontroller-settings'
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 3f94599f3..516d7eb38 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -2,7 +2,6 @@
name: dmaap-datarouter
project-name: 'dmaap-datarouter'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -37,3 +36,11 @@
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+- project:
+ name: dmaap-datarouter-clm
+ jobs:
+ - gerrit-maven-clm
+ project: dmaap/datarouter
+ project-name: 'dmaap-datarouter'
+ branch: 'master'
+ mvn-settings: 'dmaap-datarouter-settings'
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index e52b09f0c..d4fb4a1fa 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -3,7 +3,6 @@
name: dmaap-dbcapi
project-name: 'dmaap-dbcapi'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -32,3 +31,12 @@
mvn-settings: 'dmaap-dbcapi-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: dmaap-dbcapi-clm
+ jobs:
+ - gerrit-maven-clm
+ project: dmaap/dbcapi
+ project-name: 'dmaap-dbcapi'
+ branch: 'master'
+ mvn-settings: 'dmaap-dbcapi-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 7efe1ef16..85ff59f84 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -3,7 +3,6 @@
name: dmaap-messagerouter-dmaapclient
project-name: 'dmaap-messagerouter-dmaapclient'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -27,3 +26,12 @@
mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: dmaap-messagerouter-dmaapclient-clm
+ jobs:
+ - gerrit-maven-clm
+ project: dmaap/messagerouter/dmaapclient
+ project-name: 'dmaap-messagerouter-dmaapclient'
+ branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index 18d9d1cdc..ff5847346 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -4,7 +4,6 @@
name: dmaap-messagerouter-docker
project-name: 'dmaap-messagerouter-docker'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-docker-version-java-daily':
mvn-params: '-Dmaven.test.skip=true'
- '{project-name}-{stream}-docker-java-daily':
@@ -19,3 +18,13 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
build-node: ubuntu1604-docker-8c-8g
+
+- project:
+ name: dmaap-messagerouter-docker-clm
+ jobs:
+ - gerrit-maven-clm
+ project: dmaap/messagerouter/messageservice
+ project-name: 'dmaap-messagerouter-docker'
+ build-node: ubuntu1604-docker-8c-8g
+ branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-messageservice-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 914e994ad..1ff349c2c 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -3,7 +3,6 @@
name: dmaap-messagerouter-messageservice
project-name: 'dmaap-messagerouter-messageservice'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -27,3 +26,12 @@
mvn-settings: 'dmaap-messagerouter-messageservice-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: dmaap-messagerouter-messageservice-clm
+ jobs:
+ - gerrit-maven-clm
+ project: dmaap/messagerouter/messageservice
+ project-name: 'dmaap-messagerouter-messageservice'
+ branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-messageservice-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 1f888b114..3ec04eb73 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -3,7 +3,6 @@
name: dmaap-messagerouter-mirroragent
project-name: 'dmaap-messagerouter-mirroragent'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -27,3 +26,12 @@
mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: dmaap-messagerouter-mirroragent-clm
+ jobs:
+ - gerrit-maven-clm
+ project: dmaap/messagerouter/mirroragent
+ project-name: 'dmaap-messagerouter-mirroragent'
+ branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 388ecfbb1..fdd472dde 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -3,7 +3,6 @@
name: dmaap-messagerouter-msgrtr
project-name: 'dmaap-messagerouter-msgrtr'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -27,3 +26,12 @@
mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: dmaap-messagerouter-msgrtr-clm
+ jobs:
+ - gerrit-maven-clm
+ project: dmaap/messagerouter/msgrtr
+ project-name: 'dmaap-messagerouter-msgrtr'
+ branch: 'master'
+ mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index 69aadc83f..9f9bdf9f1 100644
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -44,6 +44,7 @@
files: '**'
builders:
+ - lf-infra-pre-build
- shell: '{script}'
publishers:
@@ -93,6 +94,7 @@
branch: '{branch}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index 8d1c40db8..3052dc2db 100644
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -100,6 +100,7 @@
<<: *docker_merge_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -140,6 +141,7 @@
<<: *docker_merge_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -185,6 +187,7 @@
<<: *docker_verify_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -227,6 +230,7 @@
<<: *docker_verify_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -277,6 +281,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -335,6 +340,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -379,6 +385,7 @@
<<: *docker_merge_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -416,6 +423,7 @@
<<: *docker_merge_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -461,6 +469,7 @@
<<: *docker_verify_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -499,6 +508,7 @@
<<: *docker_verify_boiler_plate
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -549,6 +559,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -607,6 +618,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -662,6 +674,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -712,6 +725,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- lf-infra-docker-login:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index a3182cc5c..e891e92df 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -45,6 +45,7 @@
files: '**'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -104,6 +105,7 @@
files: '**'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -159,6 +161,7 @@
branch: '{branch}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -169,4 +172,4 @@
publishers:
- infra-shiplogs:
- maven-version: '{maven-version}' \ No newline at end of file
+ maven-version: '{maven-version}'
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 79a00778a..664d14ea3 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -67,6 +67,7 @@
files: '{files}'
builders:
+ - lf-infra-pre-build
- shell: '{obj:pre_build_script}'
- shell: '{obj:build_script}'
@@ -90,6 +91,7 @@
files: '{files}'
builders:
+ - lf-infra-pre-build
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
@@ -124,6 +126,7 @@
comment-contains-value: '^stage-helm$'
builders:
+ - lf-infra-pre-build
- lf-provide-maven-settings:
global-settings-file: '{mvn-global-settings}'
settings-file: '{mvn-settings}'
@@ -145,6 +148,7 @@
disabled: true
builders:
+ - lf-infra-pre-build
- shell: '{pre_build_script}'
- shell: '{build_script}'
- shell: '{post_build_script}'
@@ -157,6 +161,7 @@
disabled: true
builders:
+ - lf-infra-pre-build
- shell: '{pre_build_script}'
- shell: '{build_script}'
- shell: '{post_build_script}'
@@ -180,6 +185,7 @@
choosing-strategy: default
builders:
+ - lf-infra-pre-build
- shell: '{pre_build_script}'
- shell: '{build_script}'
- shell: '{post_build_script}'
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 8f17a257f..61da2d5af 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -49,6 +49,7 @@
files: '{obj:pattern}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -150,6 +151,7 @@
branch: '{branch}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -217,6 +219,7 @@
project: '{project}'
branch: '{branch}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -293,6 +296,7 @@
branch: '{branch}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -367,6 +371,7 @@
branch: '{branch}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -444,6 +449,7 @@
branch: '{branch}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -517,6 +523,7 @@
branch: '{branch}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -594,6 +601,7 @@
files: '{pattern}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -640,6 +648,7 @@
name: '{project-name}-{stream}-merge-profile-java'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -724,7 +733,7 @@
branch: '{branch}'
builders:
-
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -809,6 +818,7 @@
project: '{project}'
branch: '{branch}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -883,7 +893,7 @@
branch: '{branch}'
builders:
-
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -951,7 +961,7 @@
branch: '{branch}'
builders:
-
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -1021,7 +1031,7 @@
branch: '{branch}'
builders:
-
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -1099,7 +1109,7 @@
branch: '{branch}'
builders:
-
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -1180,7 +1190,7 @@
branch: '{branch}'
builders:
-
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -1278,7 +1288,7 @@
branch: '{branch}'
builders:
-
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -1330,6 +1340,7 @@
build-timeout: 120
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 80ae84bb7..b30af0ea5 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -53,6 +53,7 @@
files: '{pattern}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -137,6 +138,7 @@
files: '**'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 9264bc9e5..fcbf745fc 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -47,6 +47,7 @@
files: '**'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -122,6 +123,7 @@
files: '**'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -193,6 +195,7 @@
files: '**'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -260,6 +263,7 @@
branch: '{branch}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
@@ -315,6 +319,7 @@
build-timeout: '{build-timeout}'
builders:
+ - lf-infra-pre-build
- provide-maven-settings:
global-settings-file: 'global-settings'
settings-file: '{mvn-settings}'
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index 6c4f3be29..6720c9565 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@ -3,7 +3,6 @@
name: logging-analytics-pomba-pomba-aai-context-builder
project-name: logging-analytics-pomba-pomba-aai-context-builder
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -41,3 +40,12 @@
- gerrit-info-yaml-verify
project: 'logging-analytics/pomba/pomba-aai-context-builder'
branch: 'master'
+
+- project:
+ name: logging-analytics-pomba-pomba-aai-context-builder-clm
+ jobs:
+ - gerrit-maven-clm
+ project: logging-analytics/pomba/pomba-aai-context-builder
+ project-name: logging-analytics-pomba-pomba-aai-context-builder
+ branch: 'master'
+ mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
index dc7979b77..8b84dc127 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
@@ -3,7 +3,6 @@
name: logging-analytics-pomba-pomba-audit-common
project-name: logging-analytics-pomba-pomba-audit-common
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -35,3 +34,12 @@
- gerrit-info-yaml-verify
project: 'logging-analytics/pomba/pomba-audit-common'
branch: 'master'
+
+- project:
+ name: logging-analytics-pomba-pomba-audit-common-clm
+ jobs:
+ - gerrit-maven-clm
+ project: logging-analytics/pomba/pomba-audit-common
+ project-name: logging-analytics-pomba-pomba-audit-common
+ branch: 'master'
+ mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
index 18f186952..e398f8c63 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
@@ -3,7 +3,6 @@
name: logging-analytics-pomba-pomba-context-aggregator
project-name: logging-analytics-pomba-pomba-context-aggregator
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -42,3 +41,12 @@
- gerrit-info-yaml-verify
project: 'logging-analytics/pomba/pomba-context-aggregator'
branch: 'master'
+
+- project:
+ name: logging-analytics-pomba-pomba-context-aggregator-clm
+ jobs:
+ - gerrit-maven-clm
+ project: logging-analytics/pomba/pomba-context-aggregator
+ project-name: logging-analytics-pomba-pomba-context-aggregator
+ branch: 'master'
+ mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index ae10c44e4..8bf521ceb 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
@@ -3,7 +3,6 @@
name: logging-analytics-pomba-pomba-network-discovery-context-builder
project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -41,3 +40,12 @@
- gerrit-info-yaml-verify
project: 'logging-analytics/pomba/pomba-network-discovery-context-builder'
branch: 'master'
+
+- project:
+ name: logging-analytics-pomba-pomba-network-discovery-context-builder-clm
+ jobs:
+ - gerrit-maven-clm
+ project: logging-analytics/pomba/pomba-network-discovery-context-builder
+ project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
+ branch: 'master'
+ mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
index 96d60ebc3..1fb2619f8 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
@@ -3,7 +3,6 @@
name: logging-analytics-pomba-pomba-sdc-context-builder
project-name: logging-analytics-pomba-pomba-sdc-context-builder
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -41,3 +40,12 @@
- gerrit-info-yaml-verify
project: 'logging-analytics/pomba/pomba-sdc-context-builder'
branch: 'master'
+
+- project:
+ name: logging-analytics-pomba-pomba-sdc-context-builder-clm
+ jobs:
+ - gerrit-maven-clm
+ project: logging-analytics/pomba/pomba-sdc-context-builder
+ project-name: logging-analytics-pomba-pomba-sdc-context-builder
+ branch: 'master'
+ mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index 3c48c662d..230a510f6 100644
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@ -3,7 +3,6 @@
name: logging-analytics-pomba-pomba-sdnc-context-builder
project-name: logging-analytics-pomba-pomba-sdnc-context-builder
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -39,3 +38,12 @@
- gerrit-info-yaml-verify
project: 'logging-analytics/pomba/pomba-sdnc-context-builder'
branch: 'master'
+
+- project:
+ name: logging-analytics-pomba-pomba-sdnc-context-builder-clm
+ jobs:
+ - gerrit-maven-clm
+ project: logging-analytics/pomba/pomba-sdnc-context-builder
+ project-name: logging-analytics-pomba-pomba-sdnc-context-builder
+ branch: 'master'
+ mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 20d86181b..80386843e 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -3,7 +3,6 @@
name: logging-analytics
project-name: 'logging-analytics'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -81,3 +80,12 @@
- gerrit-info-yaml-verify
project: 'logging-analytics'
branch: 'master'
+
+- project:
+ name: logging-analytics-clm
+ jobs:
+ - gerrit-maven-clm
+ project: logging-analytics
+ project-name: 'logging-analytics'
+ branch: 'master'
+ mvn-settings: 'logging-analytics-settings'
diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
index 798ee14de..03bc2d9bb 100644
--- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
+++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml
@@ -14,8 +14,6 @@
pattern: 'javatoscachecker/**'
pom: 'javatoscachecker/pom.xml'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-f javatoscachecker/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -42,3 +40,14 @@
mvn-settings: 'modeling-toscaparsers-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: modeling-toscaparsers-javatoscachecker-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f javatoscachecker/pom.xml'
+ project: modeling/toscaparsers
+ project-name: 'modeling-toscaparsers-javatoscachecker'
+ build-node: ubuntu1604-docker-8c-8g
+ branch: 'master'
+ mvn-settings: 'modeling-toscaparsers-settings'
diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
index 25a72c72e..e10e24d6e 100644
--- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
+++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml
@@ -15,8 +15,6 @@
pom: 'nfvparser/pom.xml'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- - gerrit-maven-clm:
- mvn-params: '-f nfvparser/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -34,3 +32,13 @@
mvn-settings: 'modeling-toscaparsers-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: modeling-toscaparsers-nfvparser-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f nfvparser/pom.xml'
+ project: modeling/toscaparsers
+ project-name: 'modeling-toscaparsers-nfvparser'
+ branch: 'master'
+ mvn-settings: 'modeling-toscaparsers-settings'
diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml
new file mode 100644
index 000000000..10946318a
--- /dev/null
+++ b/jjb/multicloud/multicloud-azure-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+ name: multicloud-azure-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'multicloud-azure'
+ stream: 'master'
+ functionality:
+ - 'functionality1':
+ trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index f9e94f92b..b4590be97 100644
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -12,7 +12,6 @@
pom: 'azure/pom.xml'
pattern: 'azure/**'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-{subproject}-verify-java'
@@ -39,3 +38,12 @@
mvn-settings: 'multicloud-azure-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: multicloud-azure-java-clm
+ jobs:
+ - gerrit-maven-clm
+ project: multicloud/azure
+ project-name: 'multicloud-azure'
+ branch: 'master'
+ mvn-settings: 'multicloud-azure-settings'
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 8f20092cd..8da6ac993 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -12,7 +12,6 @@
pom: 'multivimbroker/pom.xml'
pattern: 'multivimbroker/**'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-{subproject}-verify-java'
@@ -39,3 +38,12 @@
mvn-settings: 'multicloud-framework-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: multicloud-framework-java-clm
+ jobs:
+ - gerrit-maven-clm
+ project: multicloud/framework
+ project-name: 'multicloud-framework'
+ branch: 'master'
+ mvn-settings: 'multicloud-framework-settings'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index 00f6d025f..0743a2425 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -12,7 +12,6 @@
pom: 'vio/pom.xml'
pattern: 'vio/**'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-{subproject}-verify-java'
@@ -39,3 +38,12 @@
mvn-settings: 'multicloud-openstack-vmware-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: multicloud-openstack-vmware-java-clm
+ jobs:
+ - gerrit-maven-clm
+ project: multicloud/openstack/vmware
+ project-name: 'multicloud-openstack-vmware'
+ branch: 'master'
+ mvn-settings: 'multicloud-openstack-vmware-settings'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index d6cc74d47..0ff1cc55f 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -37,7 +37,6 @@
pattern: 'windriver/**'
pom: 'windriver/pom.xml'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
@@ -106,3 +105,13 @@
mvn-settings: 'multicloud-openstack-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: multicloud-openstack-clm
+ jobs:
+ - gerrit-maven-clm
+ project: multicloud/openstack
+ project-name: 'multicloud-openstack'
+ build-node: ubuntu1604-memcached-4c-4g
+ branch: 'master'
+ mvn-settings: 'multicloud-openstack-settings'
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index 788e75217..39253cd9e 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -39,7 +39,8 @@
- project:
name: optf-cmso-sonar
jobs:
- - gerrit-maven-sonar
+ - gerrit-maven-sonar:
+ mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
cron: 'H 11 * * *'
build-node: ubuntu1604-docker-8c-8g
project: 'optf/cmso'
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 7b490cb2a..788f0e7d1 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -3,7 +3,6 @@
name: policy-apex-pdp
project-name: 'policy-apex-pdp'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-scm-mvn-script':
mvn-goals: 'clean deploy -B
@@ -39,3 +38,12 @@
mvn-settings: 'policy-apex-pdp-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-apex-pdp-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/apex-pdp
+ project-name: 'policy-apex-pdp'
+ branch: 'master'
+ mvn-settings: 'policy-apex-pdp-settings'
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 29977b9fa..e8b565890 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -3,7 +3,6 @@
name: policy-api
project-name: 'policy-api'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -28,3 +27,12 @@
mvn-settings: 'policy-api-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-api-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/api
+ project-name: 'policy-api'
+ branch: 'master'
+ mvn-settings: 'policy-api-settings'
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 8607d28cc..6613576dd 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -3,7 +3,6 @@
name: policy-common
project-name: 'policy-common'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
@@ -30,3 +29,12 @@
mvn-settings: 'policy-common-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-common-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/common
+ project-name: 'policy-common'
+ branch: 'master'
+ mvn-settings: 'policy-common-settings'
diff --git a/jjb/policy/policy-core.yaml b/jjb/policy/policy-core.yaml
index 1506f6c48..4f457eb1f 100644
--- a/jjb/policy/policy-core.yaml
+++ b/jjb/policy/policy-core.yaml
@@ -3,7 +3,6 @@
name: policy-core
project-name: 'policy-core'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -28,3 +27,12 @@
mvn-settings: 'policy-core-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-core-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/core
+ project-name: 'policy-core'
+ branch: 'master'
+ mvn-settings: 'policy-core-settings'
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index bc5bcc672..53fc51083 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -3,7 +3,6 @@
name: policy-distribution
project-name: 'policy-distribution'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java':
docker-pom: 'pom.xml'
@@ -37,3 +36,12 @@
mvn-settings: 'policy-distribution-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-distribution-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/distribution
+ project-name: 'policy-distribution'
+ branch: 'master'
+ mvn-settings: 'policy-distribution-settings'
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 04f5ef392..31f9ba9e1 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -3,7 +3,6 @@
name: policy-drools-applications
project-name: 'policy-drools-applications'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
@@ -30,3 +29,12 @@
mvn-settings: 'policy-drools-applications-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-drools-applications-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/drools-applications
+ project-name: 'policy-drools-applications'
+ branch: 'master'
+ mvn-settings: 'policy-drools-applications-settings'
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index cb125b02c..717eedc8f 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -3,8 +3,6 @@
name: policy-drools-pdp
project-name: 'policy-drools-pdp'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-DskipTests'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-scm-mvn-script':
mvn-goals: 'clean deploy -B
@@ -40,3 +38,13 @@
mvn-settings: 'policy-drools-pdp-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-drools-pdp-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-DskipTests'
+ project: policy/drools-pdp
+ project-name: 'policy-drools-pdp'
+ branch: 'master'
+ mvn-settings: 'policy-drools-pdp-settings'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index f116f7bf5..0dc51b12f 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -3,8 +3,6 @@
name: policy-engine
project-name: 'policy-engine'
jobs:
- - gerrit-maven-clm:
- build-timeout: 30
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-scm-mvn-script':
mvn-goals: 'clean deploy -B
@@ -40,3 +38,13 @@
mvn-settings: 'policy-engine-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-engine-clm
+ jobs:
+ - gerrit-maven-clm:
+ build-timeout: 30
+ project: policy/engine
+ project-name: 'policy-engine'
+ branch: 'master'
+ mvn-settings: 'policy-engine-settings'
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 43a35c56d..40b9dc1f4 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -3,7 +3,6 @@
name: policy-gui
project-name: 'policy-gui'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -28,3 +27,12 @@
mvn-settings: 'policy-gui-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-gui-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/gui
+ project-name: 'policy-gui'
+ branch: 'master'
+ mvn-settings: 'policy-gui-settings'
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 60d4881a7..e8513be55 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -3,7 +3,6 @@
name: policy-models
project-name: 'policy-models'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -28,3 +27,12 @@
mvn-settings: 'policy-models-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-models-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/models
+ project-name: 'policy-models'
+ branch: 'master'
+ mvn-settings: 'policy-models-settings'
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index ad789b25a..13f2701e6 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -3,7 +3,6 @@
name: policy-pap
project-name: 'policy-pap'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -28,3 +27,12 @@
mvn-settings: 'policy-pap-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-pap-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/pap
+ project-name: 'policy-pap'
+ branch: 'master'
+ mvn-settings: 'policy-pap-settings'
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 13e97a68e..34f357813 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -3,7 +3,6 @@
name: policy-parent
project-name: 'policy-parent'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -16,3 +15,12 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: policy-parent-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/parent
+ project-name: 'policy-parent'
+ branch: 'master'
+ mvn-settings: 'policy-parent-settings'
diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
index f124bb4c0..2d299b4d1 100644
--- a/jjb/policy/policy-pdp.yaml
+++ b/jjb/policy/policy-pdp.yaml
@@ -3,7 +3,6 @@
name: policy-pdp
project-name: 'policy-pdp'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -28,3 +27,12 @@
mvn-settings: 'policy-pdp-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-pdp-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/pdp
+ project-name: 'policy-pdp'
+ branch: 'master'
+ mvn-settings: 'policy-pdp-settings'
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index 8da603c0b..0b45026c7 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -3,7 +3,6 @@
name: policy-xacml-pdp
project-name: 'policy-xacml-pdp'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -28,3 +27,12 @@
mvn-settings: 'policy-xacml-pdp-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: policy-xacml-pdp-clm
+ jobs:
+ - gerrit-maven-clm
+ project: policy/xacml-pdp
+ project-name: 'policy-xacml-pdp'
+ branch: 'master'
+ mvn-settings: 'policy-xacml-pdp-settings'
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 2e2f71370..400509d65 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -3,7 +3,6 @@
name: portal
project-name: 'portal'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-release-java-daily'
project: 'portal'
stream:
@@ -29,3 +28,12 @@
mvn-settings: 'portal-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: portal-clm
+ jobs:
+ - gerrit-maven-clm
+ project: portal
+ project-name: 'portal'
+ branch: 'master'
+ mvn-settings: 'portal-settings'
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 2ec6a80a1..6714fea8d 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -3,7 +3,6 @@
name: so-libs
project-name: 'so-libs'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -34,3 +33,12 @@
mvn-settings: 'so-libs-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: so-libs-clm
+ jobs:
+ - gerrit-maven-clm
+ project: so/libs
+ project-name: 'so-libs'
+ branch: 'master'
+ mvn-settings: 'so-libs-settings'
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 67681c458..1af2778b0 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -4,7 +4,6 @@
name: so
project-name: 'so'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -35,3 +34,13 @@
mvn-settings: 'so-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: so-clm
+ jobs:
+ - gerrit-maven-clm
+ project: so
+ project-name: 'so'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'so-settings'
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 50d8ff5be..faf9d44ab 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -13,7 +13,6 @@
pom: 'lcm/pom.xml'
pattern: 'lcm/**'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -39,3 +38,13 @@
mvn-settings: 'vfc-gvnfm-vnflcm-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-gvnfm-vnflcm-java-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/gvnfm/vnflcm
+ project-name: 'vfc-gvnfm-vnflcm'
+ build-node: centos7-redis-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-gvnfm-vnflcm-settings'
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 817926b2d..f08054a15 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -12,7 +12,6 @@
pom: 'mgr/pom.xml'
pattern: 'mgr/**'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -38,3 +37,13 @@
mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-gvnfm-vnfmgr-java-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/gvnfm/vnfmgr
+ project-name: 'vfc-gvnfm-vnfmgr'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index d2dda94a3..82d31fc75 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -13,7 +13,6 @@
pom: 'res/pom.xml'
pattern: 'res/**'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -39,3 +38,13 @@
mvn-settings: 'vfc-gvnfm-vnfres-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-gvnfm-vnfres-java-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/gvnfm/vnfres
+ project-name: 'vfc-gvnfm-vnfres'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-gvnfm-vnfres-settings'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 50164ff70..3587f4005 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -13,7 +13,6 @@
path: '.'
pattern: '**'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
@@ -39,3 +38,13 @@
mvn-settings: 'vfc-nfvo-catalog-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-catalog-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/nfvo/catalog
+ project-name: 'vfc-nfvo-catalog'
+ build-node: centos7-redis-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-catalog-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index 2e8b10c83..70bd630e0 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -13,7 +13,6 @@
pom: 'ems/pom.xml'
pattern: 'ems/**'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -38,3 +37,13 @@
mvn-settings: 'vfc-nfvo-driver-ems-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-driver-ems-java-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/nfvo/driver/ems
+ project-name: 'vfc-nfvo-driver-ems'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-ems-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
index 3b097847a..f754a2c1b 100644
--- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml
@@ -12,7 +12,6 @@
pom: 'zte/sfc-driver/pom.xml'
pattern: 'zte/sfc-driver/**'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -38,3 +37,13 @@
mvn-settings: 'vfc-nfvo-driver-sfc-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-driver-sfc-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/nfvo/driver/sfc
+ project-name: 'vfc-nfvo-driver-sfc'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-sfc-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 1dcdb3e51..86c4f7a7f 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -12,8 +12,6 @@
pom: 'huawei/pom.xml'
pattern: 'huawei/**'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-f huawei/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -34,3 +32,14 @@
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-driver-svnfm-huawei-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f huawei/pom.xml'
+ project: vfc/nfvo/driver/vnfm/svnfm
+ project-name: 'vfc-nfvo-driver-svnfm-huawei'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index 12ffa5d60..456e38123 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -13,7 +13,6 @@
pom: 'gvnfmadapter/pom.xml'
pattern: 'gvnfmadapter/**'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -39,3 +38,13 @@
mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-driver-vnfm-gvnfm-java-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/nfvo/driver/vnfm/gvnfm
+ project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
index 3c3601dcb..d32067aa3 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml
@@ -12,8 +12,6 @@
pom: 'nokia/vnfmdriver/pom.xml'
pattern: 'nokia/vnfmdriver/**'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-f nokia/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -34,3 +32,14 @@
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-driver-vnfm-svnfm-nokia-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f nokia/pom.xml'
+ project: vfc/nfvo/driver/vnfm/svnfm
+ project-name: 'vfc-nfvo-driver-svnfm-nokia'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
index 22840cd94..fc8a0db5c 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokiav2.yaml
@@ -12,8 +12,6 @@
pom: 'nokiav2/pom.xml'
pattern: 'nokiav2/**'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-f nokiav2/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -74,3 +72,14 @@
jobs:
- gerrit-maven-sonar
build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: vfc-nfvo-driver-vnfm-svnfm-nokiav2-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f nokiav2/pom.xml'
+ project: vfc/nfvo/driver/vnfm/svnfm
+ project-name: 'vfc-nfvo-driver-svnfm-nokiav2'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
index 8ff31975d..f3d376483 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml
@@ -12,8 +12,6 @@
pom: 'zte/vmanager/pom.xml'
pattern: 'zte/vmanager/**'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-f zte/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -34,3 +32,14 @@
mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-driver-vnfm-svnfm-zte-java-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f zte/pom.xml'
+ project: vfc/nfvo/driver/vnfm/svnfm
+ project-name: 'vfc-nfvo-driver-vnfm-svnfm-zte'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 743beff51..25d0f053a 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -8,7 +8,6 @@
branch: 'master'
mvn-settings: 'vfc-nfvo-lcm-settings'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -33,3 +32,13 @@
mvn-settings: 'vfc-nfvo-lcm-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-lcm-java-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/nfvo/lcm
+ project-name: 'vfc-nfvo-lcm'
+ build-node: centos7-redis-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-lcm-settings'
diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
index f6bb29fa6..4ca4852fa 100644
--- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml
+++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml
@@ -9,7 +9,6 @@
branch: 'master'
build-node: ubuntu1604-builder-4c-4g
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -31,3 +30,13 @@
mvn-settings: 'vfc-nfvo-multivimproxy-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-multivimproxy-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/nfvo/multivimproxy
+ project-name: 'vfc-nfvo-multivimproxy'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-multivimproxy-settings'
diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index 964ef4676..ba51b7dc2 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -9,7 +9,6 @@
branch: 'master'
build-node: ubuntu1604-builder-4c-4g
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -31,3 +30,13 @@
mvn-settings: 'vfc-nfvo-resmanagement-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-resmanagement-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/nfvo/resmanagement
+ project-name: 'vfc-nfvo-resmanagement'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-resmanagement-settings'
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 1a665e6e4..29ee2a07d 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -19,7 +19,6 @@
script:
!include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
@@ -55,3 +54,13 @@
mvn-settings: 'vfc-nfvo-wfengine-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vfc-nfvo-wfengine-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vfc/nfvo/wfengine
+ project-name: 'vfc-nfvo-wfengine'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-wfengine-settings'
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 7f4cb3b00..38d3c48f2 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -3,7 +3,6 @@
name: vid
project-name: 'vid'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
@@ -45,3 +44,13 @@
mvn-settings: 'vid-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vid-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vid
+ project-name: 'vid'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vid-settings'
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index a169794e4..e64ff60c9 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -17,7 +17,6 @@
mvn-settings: 'vnfsdk-dovetail-integration-settings'
build-node: ubuntu1604-builder-4c-4g
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{subproject}-python-staging-{stream}'
@@ -47,3 +46,13 @@
project: 'vnfsdk/dovetail-integration'
project-name: 'vnfsdk-dovetail-integration'
branch: 'master'
+
+- project:
+ name: vnfsdk-dovetail-integration-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vnfsdk/dovetail-integration
+ project-name: 'vnfsdk-dovetail-integration'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vnfsdk-dovetail-integration-settings'
diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index d83b42d89..74416e830 100644
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -3,7 +3,6 @@
name: vnfsdk-functest
project-name: 'vnfsdk-functest'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -37,3 +36,13 @@
project: 'vnfsdk/functest'
project-name: 'vnfsdk-functest'
branch: 'master'
+
+- project:
+ name: vnfsdk-functest-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vnfsdk/functest
+ project-name: 'vnfsdk-functest'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vnfsdk-functest-settings'
diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index 0b064052c..16ebadc94 100644
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -24,7 +24,6 @@
mvn-settings: 'vnfsdk-ice-settings'
build-node: ubuntu1604-builder-4c-4g
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{subproject}-python-staging-{stream}'
@@ -74,3 +73,13 @@
mvn-settings: 'vnfsdk-ice-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: vnfsdk-ice-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vnfsdk/ice
+ project-name: 'vnfsdk-ice'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vnfsdk-ice-settings'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index e30be0458..ceb5e2abc 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -3,7 +3,6 @@
name: vnfsdk-refrepo
project-name: 'vnfsdk-refrepo'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -44,3 +43,13 @@
project: 'vnfsdk/refrepo'
project-name: 'vnfsdk-refrepo'
branch: 'master'
+
+- project:
+ name: vnfsdk-refrepo-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vnfsdk/refrepo
+ project-name: 'vnfsdk-refrepo'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vnfsdk-refrepo-settings'
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 2a4a03999..377c2d512 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -3,7 +3,6 @@
name: vnfsdk-validation
project-name: 'vnfsdk-validation'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -36,3 +35,13 @@
project: 'vnfsdk/validation'
project-name: 'vnfsdk-validation'
branch: 'master'
+
+- project:
+ name: vnfsdk-validation-clm
+ jobs:
+ - gerrit-maven-clm
+ project: vnfsdk/validation
+ project-name: 'vnfsdk-validation'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vnfsdk-validation-settings'
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index ee9ec08dd..d4f2895c0 100644
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -7,8 +7,6 @@
pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
pattern: 'veslibrary/**'
jobs:
- - gerrit-maven-clm:
- mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- '{project-name}-{stream}-verify-java':
mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
- '{project-name}-{stream}-{subproject}-verify-java'
@@ -44,3 +42,14 @@
project: 'vnfsdk/ves-agent'
project-name: 'vnfsdk-ves-agent'
branch: 'master'
+
+- project:
+ name: vnfsdk-ves-agent-clm
+ jobs:
+ - gerrit-maven-clm:
+ mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml'
+ project: vnfsdk/ves-agent
+ project-name: 'vnfsdk-ves-agent'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'vnfsdk-ves-agent-settings'