Merge "Added maven parms to sonar job"
diff --git a/jjb/multicloud/multicloud-azure-csit.yaml b/jjb/multicloud/multicloud-azure-csit.yaml
new file mode 100644
index 0000000..1708183
--- /dev/null
+++ b/jjb/multicloud/multicloud-azure-csit.yaml
@@ -0,0 +1,12 @@
+---
+- project:
+ name: multicloud-azure-csit
+ jobs:
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'multicloud-azure'
+ stream: 'master'
+ functionality:
+ - 'functionality1':
+ trigger_jobs: 'multicloud-azure-master-docker-java-version-shell-daily'
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index 288e6f4..b194d85 100644
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -5,9 +5,12 @@
- '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'so'
- stream: 'master'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
functionality:
- 'integration-testing':
- trigger_jobs: 'so-master-docker-version-java-daily'
+ trigger_jobs: '{project-name}-{stream}-docker-version-java-daily'
robot-options: ''
- branch: 'master'
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 2593111..2ec6a80 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
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 5c55a6e..67681c4 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
mvn-settings: 'so-settings'
files: '**'
archive-artifacts: ''