summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-19 16:22:06 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-23 19:18:29 +0000
commit7e1b771b275ed004734e94629cc5a60c2641db74 (patch)
treee3c501ccf0f53cebfe8f32d066b0ac61a9581cb9
parent99297e2838a98b3cdeb687634b1c478d457c197b (diff)
MULTICLOUD-Refactor CLM project block
The clm job portion needs to be on its own project section similar to the Sonar portion. The reason behind this, is because we only want this job to be running for master and no other branches. Also, this is in preparation for the work that is to come from global-jjb on application names in CLM. Change-Id: I687796265ae87c0698416c8649efdfd491779107 Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
-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
4 files changed, 37 insertions, 4 deletions
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'