Merge "Add more timeout to SDC CLM"
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 89eeaf4..336001e 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -22,7 +22,7 @@
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'aaf/cadi'
- project-name: 'aaf-cadi'
+ project-name: 'aaf-cadi-shiro'
branch: 'master'
mvn-params: '-f shiro/pom.xml'
mvn-settings: 'aaf-cadi-settings'
diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
new file mode 100644
index 0000000..812b22f
--- /dev/null
+++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
@@ -0,0 +1,36 @@
+---
+- project:
+ name: dcaegen2-collectors-restconf
+ project-name: 'dcaegen2-collectors-restconf'
+ jobs:
+ - gerrit-maven-clm
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
+
+ project: 'dcaegen2/collectors/restconf'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dcaegen2-collectors-restconf-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 in the job
+ maven-deploy-properties: |
+ deployAtEnd=true
+ files: '**'
+ archive-artifacts: ''
+ build-node: 'ubuntu1604-docker-8c-8g'
+
+- project:
+ name: dcaegen2-collectors-restconf-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: '@daily'
+ build-node: ubuntu1604-docker-8c-8g
+ project: 'dcaegen2/collectors/restconf'
+ project-name: 'dcaegen2-collectors-restconf'
+ branch: 'master'
+ mvn-settings: 'dcaegen2-collectors-restconf-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml
index a7fe916..70804c4 100644
--- a/jjb/integration/integration-csit.yaml
+++ b/jjb/integration/integration-csit.yaml
@@ -8,6 +8,8 @@
stream:
- 'master':
branch: 'master'
+ - 'casablanca':
+ branch: 'casablanca'
functionality:
- 'functionality1':
trigger_jobs:
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 2593111..4b7e834 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -11,6 +11,8 @@
stream:
- 'master':
branch: 'master'
+ - 'Dublin-dev':
+ branch: 'Dublin-dev'
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..dbf6e84 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -16,6 +16,8 @@
stream:
- 'master':
branch: 'master'
+ - 'Dublin-dev':
+ branch: 'Dublin-dev'
mvn-settings: 'so-settings'
files: '**'
archive-artifacts: ''