Merge "Use local mirror when calling Gerrit"

diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 89eeaf4..336001e 100644 (file)
--- 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/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 41ea0ee..37cdb1f 100644 (file)
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -10,6 +10,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -24,7 +26,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-aai-common-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -34,8 +36,9 @@
     name: aai-aai-common-clm
     jobs:
       - gerrit-maven-clm
+    build-node: ubuntu1604-builder-4c-4g
     project: 'aai/aai-common'
     project-name: 'aai-aai-common'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-aai-common-settings'
     mvn-version: 'mvn35'

diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index 91c7dac..1b2a9e6 100644 (file)
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -28,7 +30,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/cacher'
     project-name: 'aai-cacher'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-cacher-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,7 +42,7 @@
       - gerrit-maven-clm
     project: 'aai/cacher'
     project-name: 'aai-cacher'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-cacher-settings'
     mvn-version: 'mvn35'
 

diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 6f85de0..2b29487 100644 (file)
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -28,7 +30,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,6 +42,6 @@
       - gerrit-maven-clm
     project: 'aai/graphadmin'
     project-name: 'aai-graphadmin'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-graphadmin-settings'
     mvn-version: 'mvn35'

diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index af670d4..ef87c10 100644 (file)
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -28,7 +30,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/resources'
     project-name: 'aai-resources'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-resources-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,6 +42,6 @@
       - gerrit-maven-clm
     project: 'aai/resources'
     project-name: 'aai-resources'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-resources-settings'
     mvn-version: 'mvn35'

diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index fa7719b..2595980 100644 (file)
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -14,12 +14,3 @@
     mvn-settings: 'aai-sparky-fe-settings'
     files: '**'
     archive-artifacts: ''
-
-- project:
-    name: aai-sparky-fe-clm
-    jobs:
-      - gerrit-maven-clm
-    project: 'aai/sparky-fe'
-    project-name: 'aai-sparky-fe'
-    branch: 'master'
-    mvn-settings: 'aai-sparky-fe-settings'

diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 82385bf..058a285 100644 (file)
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -14,6 +14,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'casablanca':
+          branch: 'casablanca'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'
     files: '**'
@@ -28,7 +30,7 @@
     build-node: ubuntu1604-builder-4c-4g
     project: 'aai/traversal'
     project-name: 'aai-traversal'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-traversal-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -40,6 +42,6 @@
       - gerrit-maven-clm
     project: 'aai/traversal'
     project-name: 'aai-traversal'
-    branch: 'master'
+    branch: 'casablanca'
     mvn-settings: 'aai-traversal-settings'
     mvn-version: 'mvn35'

diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml
index 7e4e9cd..3fe0049 100644 (file)
--- a/jjb/appc/appc-csit.yaml
+++ b/jjb/appc/appc-csit.yaml
@@ -8,6 +8,8 @@
     stream:
       - 'master':
           branch: master
+      - 'casablanca':
+          branch: 'casablanca'
     functionality:
       - 'healthcheck':
           trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle'

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index 040913b..a863e6e 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -27,6 +27,8 @@
     jobs:
       - 'docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
+      - 'docker-version-java-daily':
+          mvn-params: '-Dmaven.test.skip=true'
     project: 'appc/deployment'
     stream:
       - 'master':

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index 5949e1a..c932630 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -11,8 +11,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''
@@ -32,8 +30,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'ccsdk-distribution-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/dcae-bulkpm/dcae-bulkpm-csit.yaml b/jjb/dcae-bulkpm/dcae-bulkpm-csit.yaml
deleted file mode 100644 (file)
index 5fad587..0000000
--- a/jjb/dcae-bulkpm/dcae-bulkpm-csit.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- project:
-    name: dcae-bulkpm-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'dcae-bulkpm'
-    stream: 'master'
-    functionality:
-      - 'bulkpm-suite':
-          trigger_jobs:
-            - '{project-name}-{stream}-docker-java-shell-daily'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml
new file mode 100644 (file)
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/demo/demo.yaml b/jjb/demo/demo.yaml
index 4683292..c3d19f5 100644 (file)
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -4,7 +4,6 @@
     name: demo
     project-name: 'demo'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'

diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml
index a7fe916..70804c4 100644 (file)
--- 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/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 9b711ec..20d8618 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -73,3 +73,11 @@
           pattern: 'pylog/**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
+
+- project:
+    name: logging-analytics-info
+    project-name: 'logging-analytics'
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'logging-analytics'
+    branch: 'master'

diff --git a/jjb/optf/build-optf-cmso-docker-image.sh b/jjb/optf/build-optf-cmso-docker-image.sh
new file mode 100644 (file)
index 0000000..7bfa078
--- /dev/null
+++ b/jjb/optf/build-optf-cmso-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash\r
+#\r
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='\r
+\r
+CURRENTDIR="$(pwd)"\r
+echo $CURRENTDIR\r
+\r
+chmod 755 ./docker/*.*\r
+\r
+./docker/build_image.sh\r

diff --git a/jjb/optf/optf-cmso-csit.yaml b/jjb/optf/optf-cmso-csit.yaml
new file mode 100644 (file)
index 0000000..b655a67
--- /dev/null
+++ b/jjb/optf/optf-cmso-csit.yaml
@@ -0,0 +1,15 @@
+---\r
+- project:\r
+     name: optf-cmso-csit\r
+     jobs:\r
+       - '{project-name}-{stream}-verify-csit-{functionality}'\r
+       - '{project-name}-{stream}-csit-{functionality}'\r
+     project-name: 'optf-cmso'\r
+     stream:\r
+       - 'master':\r
+           branch: master\r
+     functionality:\r
+       - 'cmso':\r
+           trigger_jobs: 'optf-cmso-master-docker-java-version-shell-daily'\r
+     robot-options: ''\r
+     branch: 'master'\r

diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
new file mode 100644 (file)
index 0000000..e6ef1f9
--- /dev/null
+++ b/jjb/optf/optf-cmso.yaml
@@ -0,0 +1,64 @@
+---\r
+- project:\r
+    name: optf-cmso\r
+    project-name: 'optf-cmso'\r
+    project: 'optf/cmso'\r
+    stream:\r
+      - 'master':\r
+          branch: 'master'\r
+    mvn-settings: 'optf-cmso-settings'\r
+    subproject:\r
+      - 'cmso':\r
+          path: '.'\r
+          pattern: '**'\r
+          pom: 'pom.xml'\r
+    jobs:\r
+      - gerrit-maven-clm\r
+      - '{project-name}-{stream}-{subproject}-verify-java'\r
+      - '{project-name}-{stream}-{subproject}-merge-java'\r
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'\r
+    files: '**'\r
+    archive-artifacts: ''\r
+    build-node: 'ubuntu1604-builder-4c-4g'\r
+\r
+- project:\r
+    name: optf-cmso-docker\r
+    project-name: 'optf-cmso'\r
+    project: 'optf/cmso'\r
+    stream:\r
+      - 'master':\r
+          branch: 'master'\r
+    mvn-settings: 'optf-cmso-settings'\r
+    subproject:\r
+      - 'cmso':\r
+          path: '.'\r
+          pattern: '**'\r
+          pom: 'pom.xml'\r
+    jobs:\r
+      - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':\r
+          docker-pom: 'pom.xml'\r
+          mvn-goals: 'install'\r
+          mvn-params: '-Dmaven.test.skip=true'\r
+          script:\r
+            !include-raw-escape: 'build-optf-cmso-docker-image.sh'\r
+          build-node: queue-docker-4c-4g\r
+      - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':\r
+          docker-pom: 'pom.xml'\r
+          mvn-goals: 'install'\r
+          mvn-params: '-Dmaven.test.skip=true'\r
+          script:\r
+            !include-raw-escape: 'build-optf-cmso-docker-image.sh'\r
+          build-node: queue-docker-4c-4g\r
+\r
+- project:\r
+    name: optf-cmso-sonar\r
+    jobs:\r
+      - gerrit-maven-sonar\r
+    cron: 'H 11 * * *'\r
+    build-node: ubuntu1604-builder-4c-4g\r
+    project: 'optf/cmso'\r
+    project-name: 'optf-cmso'\r
+    branch: 'master'\r
+    mvn-settings: 'optf-cmso-settings'\r
+    mvn-goals: 'clean install'\r
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'\r

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 59fd254..7b490cb 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -16,7 +16,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
 
     project: 'policy/apex-pdp'
     stream:

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 4e1aa98..8607d28 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+          disabled: false
 
     project: 'policy/common'
     stream:

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 7a27d29..bc5bcc6 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -13,7 +13,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          disabled: true
+          disabled: false
           build-node: ubuntu1604-docker-8c-8g
 
     project: 'policy/distribution'

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 6d8f152..04f5ef3 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -7,7 +7,7 @@
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily':
-          disabled: true
+          disabled: false
 
     project: 'policy/drools-applications'
     stream:

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 4fb26a0..cb125b0 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -17,7 +17,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
 
     project: 'policy/drools-pdp'
     stream:

diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index 4399e90..f116f7b 100644 (file)
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -17,7 +17,7 @@
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
           script:
             !include-raw-escape: 'include-raw-docker-release.sh'
-          disabled: true
+          disabled: false
 
     project: 'policy/engine'
     stream:

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index c36a9a4..13e97a6 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -6,6 +6,7 @@
       - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
 
     project: 'policy/parent'
     stream:

diff --git a/jjb/portal-sdk/portal-sdk-csit.yaml b/jjb/portal-sdk/portal-sdk-csit.yaml
deleted file mode 100644 (file)
index c5667e6..0000000
--- a/jjb/portal-sdk/portal-sdk-csit.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: portal-sdk-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'portal-sdk'
-    stream: 'master'
-    functionality:
-      - 'testsuite':
-          trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index b5fab5f..fbde4c6 100644 (file)
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -18,14 +18,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-2.1.0':
-          branch: 'release-2.1.0'
-      - 'release-2.1.1':
-          branch: 'release-2.1.1'
-      - 'release-2.2.0':
-          branch: 'release-2.2.0'
-      - 'release-2.3.0':
-          branch: 'release-2.3.0'
       - 'release-2.4.0':
           branch: 'release-2.4.0'
     mvn-settings: 'portal-sdk-settings'

diff --git a/jjb/portal/portal-csit.yaml b/jjb/portal/portal-csit.yaml
deleted file mode 100644 (file)
index 697db46..0000000
--- a/jjb/portal/portal-csit.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- project:
-    name: portal-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'portal'
-    stream: 'master'
-    functionality:
-      - 'testsuite':
-          trigger_jobs: 'portal-docker-{stream}-merge-docker-script'
-    robot-options: ''
-    branch: 'master'

diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
index a6b5830..fa4e651 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
+++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
@@ -6,9 +6,14 @@
     stream:
       - 'master':
           branch: 'master'
+    subproject:
+    - dcae-d-tosca-lab:
+        path: '.'
+        pattern: '**'
     mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
     build-node: ubuntu1604-docker-8c-8g
     jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
     docker-pom: 'pom.xml'

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index d084c8d..bbe8a17 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -17,6 +17,7 @@
           mvn-profile: 'docker'
           mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
       - gerrit-maven-clm:
+          build-timeout: 120
           mvn-params: '-Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'
     project: 'sdc'
     stream:

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index 7e9b284..5c5a674 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -12,8 +12,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''
@@ -31,8 +29,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'sdnc-oam-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 2593111..2fa46c0 100644 (file)
--- 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..a25b20b 100644 (file)
--- 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: ''