summaryrefslogtreecommitdiffstats
path: root/jjb/logging-analytics
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-19 16:12:57 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-23 21:35:51 +0000
commitd4c03b7bb4a5b8506d7bf0d4f69b1f93135e205b (patch)
tree9e2c023e518a74b29de709c848b4772178ca607c /jjb/logging-analytics
parent99297e2838a98b3cdeb687634b1c478d457c197b (diff)
LOG-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: I94fde04410f36d78077e5126ea223d819654f91f Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'jjb/logging-analytics')
-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
7 files changed, 63 insertions, 7 deletions
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'