Clean up policy dublin and release jobs

No longer releasing dublin artifacts and cleaning out the
old release jobs no longer needed due to global-jjb migration.

Issue-ID: POLICY-1737
Change-Id: I914ff64b12845d8fad19cf97620dfd346c3fcc32
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 10ef69d..d94bf4b 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -14,11 +14,6 @@
          docker-pom: 'pom.xml'
          mvn-profile: 'docker'
          mvn-params: "-P docker"
-      - '{project-name}-{stream}-docker-version-java-daily':
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: '-P docker'
-         disabled: true
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -39,33 +34,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
 
-- project:
-    name: policy-apex-pdp-dublin
-    project-name: 'policy-apex-pdp-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'policy/apex-pdp'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-apex-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
 - project:
     name: policy-apex-pdp-sonar
     jobs:

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index 8038cb3..24af5a9 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -8,12 +8,6 @@
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
           build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -34,28 +28,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: policy-api-dublin
-    project-name: 'policy-api-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-
-    project: 'policy/api'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-api-settings'
-
 - project:
     name: policy-api-sonar
     jobs:

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 2e99c97..2085e1a 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -9,8 +9,6 @@
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
 
     project: 'policy/common'
     stream:
@@ -21,24 +19,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: policy-common-dublin
-    project-name: 'policy-common-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
-
-    project: 'policy/common'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-common-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
 - project:
     name: policy-common-sonar
     jobs:

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index b0ded4a..3c8a380 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -8,11 +8,6 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: "-P docker"
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-P docker'
-          disabled: true
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -33,33 +28,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
 
-- project:
-    name: policy-drools-pdp-dublin
-    project-name: 'policy-drools-pdp-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-scm-mvn-script':
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-merge.sh'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'clean deploy -B
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
-          script:
-            !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-    project: 'policy/drools-pdp'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-drools-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
-
 - project:
     name: policy-drools-pdp-sonar
     jobs:

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index b9f6c78..b807d2d 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -5,8 +5,6 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -21,24 +19,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: policy-models-dublin
-    project-name: 'policy-models-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
-
-    project: 'policy/models'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-models-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
 - project:
     name: policy-models-sonar
     jobs:

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 8a6666b..73727b0 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -8,12 +8,6 @@
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
           build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -34,31 +28,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: policy-pap-dublin
-    project-name: 'policy-pap-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-
-    project: 'policy/pap'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-pap-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
 - project:
     name: policy-pap-sonar
     jobs:

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 7722b81..116846a 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -21,24 +21,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: policy-parent-dublin
-    project-name: 'policy-parent-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily':
-          disabled: false
-
-    project: 'policy/parent'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-parent-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
 - project:
     name: policy-parent-clm
     jobs:

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index e50db07..feb9afe 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -8,12 +8,6 @@
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
           build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
-          build-node: ubuntu1604-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
@@ -34,31 +28,6 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
-- project:
-    name: policy-xacml-pdp-dublin
-    project-name: 'policy-xacml-pdp-dublin'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-8c-8g
-      - '{project-name}-{stream}-docker-version-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
-          disabled: false
-          build-node: ubuntu1604-docker-8c-8g
-
-    project: 'policy/xacml-pdp'
-    stream:
-      - 'dublin':
-          branch: 'dublin'
-    mvn-settings: 'policy-xacml-pdp-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
-
 - project:
     name: policy-xacml-pdp-sonar
     jobs: