summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-19 18:25:11 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-23 21:38:41 +0000
commitc6243043dad580d7fef99401fbdc437390fd1e2b (patch)
tree7debd03f430d9d04e2999afa7bfff0d0aec8ff89
parent99297e2838a98b3cdeb687634b1c478d457c197b (diff)
SDNC-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: If9113ca802b2facfe635e7a11dd3e08bce15c05a Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
-rw-r--r--jjb/sdnc/sdnc-apps.yaml11
-rw-r--r--jjb/sdnc/sdnc-northbound.yaml11
-rw-r--r--jjb/sdnc/sdnc-oam.yaml11
3 files changed, 30 insertions, 3 deletions
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index cd04a351c..2f00a9ef5 100644
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -3,7 +3,6 @@
name: sdnc-apps
project-name: 'sdnc-apps'
jobs:
- - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -57,3 +56,13 @@
archive-artifacts: ''
build-node: queue-docker-4c-4g
+
+- project:
+ name: sdnc-apps-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdnc/apps
+ project-name: 'sdnc-apps'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'sdnc-apps-settings'
diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml
index 45daa08f2..acfe8a8e2 100644
--- a/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@ -3,7 +3,6 @@
name: sdnc-northbound
project-name: 'sdnc-northbound'
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 @@
mvn-settings: 'sdnc-northbound-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: sdnc-northbound-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdnc/northbound
+ project-name: 'sdnc-northbound'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'sdnc-northbound-settings'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index f9bc31a67..8a0433ef4 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -4,7 +4,6 @@
name: sdnc-oam
project-name: 'sdnc-oam'
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 @@
files: '**'
archive-artifacts: ''
build-node: queue-docker-4c-4g
+
+- project:
+ name: sdnc-oam-clm
+ jobs:
+ - gerrit-maven-clm
+ project: sdnc/oam
+ project-name: 'sdnc-oam'
+ build-node: ubuntu1604-builder-4c-4g
+ branch: 'master'
+ mvn-settings: 'sdnc-oam-settings'