summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2017-12-04 17:28:36 +0000
committerGerrit Code Review <gerrit@onap.org>2017-12-04 17:28:36 +0000
commit51c4b5f5788d400b90103dd18d1bba129a45546e (patch)
treed980a3a45ba91144d92cf4c4ea4a67a345bfded9 /jjb
parent35e67a13b190a7ce42e4e38a19c99277f672740f (diff)
parent2dcb4ee04a11e53038e673b3c2eca2bab3021d93 (diff)
Merge "Add the amsterdam jobs for aai repos"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-aai-common.yaml2
-rw-r--r--jjb/aai/aai-champ.yaml2
-rw-r--r--jjb/aai/aai-csit.yaml4
-rw-r--r--jjb/aai/aai-data-router.yaml4
-rw-r--r--jjb/aai/aai-esr-gui.yaml2
-rw-r--r--jjb/aai/aai-esr-server.yaml2
-rw-r--r--jjb/aai/aai-logging-service.yaml2
-rw-r--r--jjb/aai/aai-model-loader.yaml2
-rw-r--r--jjb/aai/aai-resources.yaml2
-rw-r--r--jjb/aai/aai-rest-client.yaml2
-rw-r--r--jjb/aai/aai-router-core-service.yaml2
-rw-r--r--jjb/aai/aai-search-data-service.yaml4
-rw-r--r--jjb/aai/aai-sparky-be.yaml4
-rw-r--r--jjb/aai/aai-sparky-fe.yaml2
-rw-r--r--jjb/aai/aai-traversal.yaml2
15 files changed, 34 insertions, 4 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 403ddd00c..faf4ea5cd 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-aai-common-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index ce859701c..acbd4883f 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-champ-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
index 303aa5f5c..41ac0e9aa 100644
--- a/jjb/aai/aai-csit.yaml
+++ b/jjb/aai/aai-csit.yaml
@@ -17,4 +17,6 @@
trigger_jobs:
- 'aai-esr-server-{stream}-docker-java-daily'
robot-options: ''
- branch: 'master'
+ branch:
+ - 'master'
+ - 'amsterdam'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index a3c15ee4a..ae83d7f80 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-data-router-settings'
files: '**'
- archive-artifacts: '' \ No newline at end of file
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index e2efa919a..face2b853 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-esr-gui-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index 2f7076ba4..ba7003956 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -14,6 +14,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-esr-server-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 8aa510ac9..948447db6 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -14,6 +14,8 @@
branch: 'master'
- 'release-1.0.0':
branch: 'release-1.0.0'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-logging-service-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index ac761c518..0b2381d7b 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-model-loader-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 0f466e69e..6caccad3b 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -19,6 +19,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-resources-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 51374a20a..c9dcd790b 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-rest-client-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 17323195e..d454d8c86 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -12,6 +12,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-router-core-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index de9af76f0..e6a67b694 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-search-data-service-settings'
files: '**'
- archive-artifacts: '' \ No newline at end of file
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 8f49eb3de..80b159662 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -15,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-sparky-be-settings'
files: '**'
- archive-artifacts: '' \ No newline at end of file
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index fd1b330e6..bec805f26 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -13,6 +13,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-sparky-fe-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 3803ca3ba..c8d8ec058 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -19,6 +19,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'aai-traversal-settings'
files: '**'
archive-artifacts: ''