summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsg481n <sg481n@att.com>2017-09-26 14:57:23 +0000
committersg481n <sg481n@att.com>2017-09-26 14:57:28 +0000
commit39e32585cb368944cbf42c0d0c2fada4189f7faa (patch)
tree0623de62b55e0b4aca0bb9c1d6e13d94f2cd57ed
parentde9a3012c0b3f0ed274ca3098e4e58cbf1db9dc8 (diff)
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>
-rw-r--r--jjb/aaf/aaf-authz.yaml2
-rw-r--r--jjb/aaf/aaf-cadi.yaml2
-rw-r--r--jjb/aaf/aaf-inno.yaml2
-rw-r--r--jjb/dmaap/dmaap-datarouter-docker.yaml34
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml22
5 files changed, 0 insertions, 62 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index f2c7860c5..8171e3276 100644
--- 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 8c5b20dd2..90e513bb8 100644
--- 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 2097444a1..eb4cb8896 100644
--- 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
index 873affde8..000000000
--- a/jjb/dmaap/dmaap-datarouter-docker.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-
-- project:
- name: dmaap-datarouter-docker
- project-name: 'dmaap-datarouter-docker'
- jobs:
- - '{project-name}-{stream}-clm'
- - '{project-name}-{stream}-verify-java-checkstyle'
- - '{project-name}-{stream}-merge-properties-java':
- mvn_properties:
- - docker.pull.registry=nexus3.onap.org:10001
- - docker.push.registry=nexus3.onap.org:10003
- - '{project-name}-{stream}-release-java-daily-checkstyle':
- mvn_properties:
- - skipDockerBuild=true
- - skipDockerTag=true
- - skipDockerPush=true
- - '{project-name}-{stream}-docker-java-properties-daily':
- docker-pom: 'pom.xml'
- mvn-profile: 'docker'
- maven-properties: |
- skip.docker.build=false
- skip.docker.tag=false
- skip.docker.push=false
- dmaap-datarouter-docker.registry=$
-
- project: 'dmaap/datarouter'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'dmaap-datarouter-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
deleted file mode 100644
index 89e78eca7..000000000
--- 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