Merge "Remove unneeded Jenkins jobs"

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
deleted file mode 100644 (file)
index ad94856..0000000
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- project:
-    name: dmaap-buscontroller
-    project-name: 'dmaap-buscontroller'
-    jobs:
-      - '{project-name}-{stream}-clm'
-      - '{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: 'dmaap/buscontroller/pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
-          mvn-goals: 'clean install'
-    project: 'dmaap/buscontroller'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-    mvn-settings: 'dmaap-buscontroller-settings'
-    files: '**'
-    archive-artifacts: ''

diff --git a/jjb/dmaap/dmaap-datarouter-docker.yaml b/jjb/dmaap/dmaap-datarouter-docker.yaml
deleted file mode 100644 (file)
index 873affd..0000000
--- a/jjb/dmaap/dmaap-datarouter-docker.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----\r
-\r
-- project:\r
-    name: dmaap-datarouter-docker\r
-    project-name: 'dmaap-datarouter-docker'\r
-    jobs:\r
-      - '{project-name}-{stream}-clm'\r
-      - '{project-name}-{stream}-verify-java-checkstyle'\r
-      - '{project-name}-{stream}-merge-properties-java':\r
-         mvn_properties:\r
-            - docker.pull.registry=nexus3.onap.org:10001\r
-            - docker.push.registry=nexus3.onap.org:10003\r
-      - '{project-name}-{stream}-release-java-daily-checkstyle':\r
-         mvn_properties:\r
-          - skipDockerBuild=true\r
-          - skipDockerTag=true\r
-          - skipDockerPush=true\r
-      - '{project-name}-{stream}-docker-java-properties-daily':\r
-         docker-pom: 'pom.xml'\r
-         mvn-profile: 'docker'\r
-         maven-properties: |\r
-          skip.docker.build=false\r
-          skip.docker.tag=false\r
-          skip.docker.push=false\r
-          dmaap-datarouter-docker.registry=$\r
-\r
-    project: 'dmaap/datarouter'\r
-    stream:\r
-      - 'master':\r
-          branch: 'master'\r
-    mvn-settings: 'dmaap-datarouter-settings'\r
-    files: '**'\r
-    archive-artifacts: ''\r
-    build-node: ubuntu1604-docker-8c-8g\r

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
deleted file mode 100644 (file)
index 89e78ec..0000000
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- project:
-    name: dmaap-datarouter
-    project-name: 'dmaap-datarouter'
-    jobs:
-      - '{project-name}-{stream}-clm'
-      - '{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'
-          mvn-goals: 'clean install'
-    project: 'dmaap/datarouter'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-    mvn-settings: 'dmaap-datarouter-settings'
-    files: '**'
-    archive-artifacts: ''
\ No newline at end of file

diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
deleted file mode 100644 (file)
index cc5c7d7..0000000
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-- project:
-    name: dmaap-dbcapi
-    project-name: 'dmaap-dbcapi'
-    jobs:
-      - '{project-name}-{stream}-clm'
-      - '{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: 'dmaap/dbcapi/pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
-          mvn-goals: 'clean install'
-    project: 'dmaap/dbcapi'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-    mvn-settings: 'dmaap-dbcapi-settings'
-    files: '**'
-    archive-artifacts: ''

diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 5f4a167..9b151ed 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -15,8 +15,6 @@
     stream:\r
       - 'master':\r
           branch: 'master'\r
-      - 'release-1.0.0':\r
-          branch: 'release-1.0.0'\r
     mvn-settings: 'dmaap-messagerouter-mirroragent-settings'\r
     files: '**'\r
     archive-artifacts: ''
\ No newline at end of file

diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index a2bba7f..8db7b7c 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -15,8 +15,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
     files: '**'
     archive-artifacts: ''
\ No newline at end of file

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 5f36982..3a65a63 100644 (file)
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -15,8 +15,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'so-libs-settings'
     # due to a strange macro / variable translation problem this needs to be
     # passed as a string block to properly get the properties correctly defined

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index a7b2e2b..120a604 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -16,7 +16,6 @@
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-      - '{project-name}-docker-image-blessing'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
@@ -26,8 +25,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index 5e37e0a..2a2ce3e 100644 (file)
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -10,7 +10,6 @@
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
-      - '{project-name}-docker-image-blessing'
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'