summaryrefslogtreecommitdiffstats
path: root/jjb/appc
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/appc')
-rw-r--r--jjb/appc/appc-csit.yaml7
-rw-r--r--jjb/appc/appc-deployment.yaml2
-rw-r--r--jjb/appc/appc-master.yaml3
3 files changed, 10 insertions, 2 deletions
diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml
index 1a364df32..e257a8bc4 100644
--- a/jjb/appc/appc-csit.yaml
+++ b/jjb/appc/appc-csit.yaml
@@ -5,10 +5,13 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'appc'
- stream: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
functionality:
- 'healthcheck':
trigger_jobs:
- '{project-name}-{stream}-release-java-daily-checkstyle'
robot-options: ''
- branch: 'master'
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index c6bd45f56..782e6e253 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -17,6 +17,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'appc-deployment-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index 19ef02097..34f7b376c 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -6,6 +6,7 @@
- gerrit-maven-clm:
java-version: ''
mvn-params: '-DskipTests'
+ build-timeout: 30
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
@@ -14,6 +15,8 @@
stream:
- 'master':
branch: 'master'
+ - 'amsterdam':
+ branch: 'amsterdam'
mvn-settings: 'appc-settings'
files: '**'
archive-artifacts: ''