summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-03-09 18:33:09 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-09 18:33:09 +0000
commit3155d32d900829ab39a9d8fea4e41e9b32e2a097 (patch)
treec597ac8b76fd49722df40a165f6cf62006f71f0a
parent3e985c7286b2919947197883f19b36116c5f7fcf (diff)
parent1ef95ab585509ed43e6ea737c4e1091aafa3650f (diff)
Merge "Remove older merge/release jobs"
-rw-r--r--jjb/policy/policy-common.yaml3
-rw-r--r--jjb/policy/policy-drools-applications.yaml3
-rw-r--r--jjb/policy/policy-drools-pdp.yaml5
-rw-r--r--jjb/policy/policy-engine.yaml5
4 files changed, 0 insertions, 16 deletions
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index e664f6e81..fb760424c 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -7,9 +7,6 @@
- '{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: 'policy/common'
stream:
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index bdbfd497d..ccf078eed 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -8,9 +8,6 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
disabled: true
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
project: 'policy/drools-applications'
stream:
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 920e1eb8d..3fc8f576e 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -6,11 +6,6 @@
- gerrit-maven-clm:
mvn-params: '-DskipTests'
- '{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-name}-{stream}-merge-scm-mvn-script':
mvn-goals: 'clean deploy -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index e379e4b04..a8a9a1766 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -6,11 +6,6 @@
- gerrit-maven-clm:
build-timeout: 30
- '{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-name}-{stream}-merge-scm-mvn-script':
mvn-goals: 'clean deploy -B
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'