Update Jenkins yaml file to remove release branch

Updated Jenkins yaml files for aaf authz,cadi,inno projects
and remvoed release branch which is not exist.Removed dmaap-datarouter
yaml files from ci-managament as this project not for Amsterdam release.

Issue-id: AAF-77
Change-Id: Ib41b5fb830432d618f4dc94b862f5e2588552102
Signed-off-by: sg481n <sg481n@att.com>

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index f2c7860..8171e32 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -18,8 +18,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'aaf-authz-settings'
     mvn-profile: docker
     docker-pom: 'authz-service/pom.xml'

diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 8c5b20d..90e513b 100644 (file)
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -15,8 +15,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
     mvn-settings: 'aaf-cadi-settings'
     files: '**'
     archive-artifacts: ''
\ No newline at end of file

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

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