From 1ef95ab585509ed43e6ea737c4e1091aafa3650f Mon Sep 17 00:00:00 2001 From: Pamela Dragosh Date: Thu, 8 Mar 2018 13:00:50 -0500 Subject: [PATCH] Remove older merge/release jobs We have the new merge/release jobs working so I am following up by removing the old merge/release jobs that we no longer need. Also removing the stage site jobs per Release Planning decisions. Refer to https://gerrit.onap.org/r/#/c/33657/ Issue-ID: POLICY-623 Change-Id: I1a70416c398af659ad71f9a23a0e757ea3b2fdfd Signed-off-by: Pamela Dragosh --- jjb/policy/policy-common.yaml | 3 --- jjb/policy/policy-drools-applications.yaml | 3 --- jjb/policy/policy-drools-pdp.yaml | 5 ----- jjb/policy/policy-engine.yaml | 5 ----- 4 files changed, 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' -- 2.16.6