Merge "Remove CCSDK/SDNC R1 Jobs"

diff --combined jjb/ccsdk/distribution.yaml
index c7dd5e1,a77f6a3..29dfe0f
--- 1/jjb/ccsdk/distribution.yaml
--- 2/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@@ -4,9 -4,10 +4,9 @@@
      project-name: 'ccsdk-distribution'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
 -      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
 +      - '{project-name}-{stream}-release-version-java-daily'
        - '{project-name}-{stream}-docker-java-daily'
        - '{project-name}-{stream}-docker-version-java-daily'
  
@@@ -14,22 -15,9 +14,20 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'ccsdk-distribution-settings'
      files: '**'
      archive-artifacts: ''
      docker-pom: 'pom.xml'
      mvn-profile: docker
      build-node: ubuntu1604-docker-8c-8g
 +- project:
 +    name: ccsdk-distribution-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    project: 'ccsdk/distribution'
 +    project-name: 'ccsdk-distribution'
 +    branch: 'master'
 +    mvn-settings: 'ccsdk-distribution-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/ccsdk/parent.yaml
index 28e12b4,d1a4204..033f1c1
--- 1/jjb/ccsdk/parent.yaml
--- 2/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@@ -4,6 -4,7 +4,6 @@@
      project-name: 'ccsdk-parent'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - '{project-name}-{stream}-release-version-java-daily'
@@@ -12,8 -13,6 +12,6 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'ccsdk-parent-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 --combined jjb/ccsdk/platform-nbapi.yaml
index d506beb,771087a..ce67fa1
--- 1/jjb/ccsdk/platform-nbapi.yaml
--- 2/jjb/ccsdk/platform-nbapi.yaml
+++ b/jjb/ccsdk/platform-nbapi.yaml
@@@ -4,16 -4,15 +4,14 @@@
      project-name: 'ccsdk-platform-nbapi'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
 -      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
 +      - '{project-name}-{stream}-release-version-java-daily'
  
      project: 'ccsdk/platform/nbapi'
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'ccsdk-platform-nbapi-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
@@@ -22,14 -21,3 +20,14 @@@
        deployAtEnd=true
      files: '**'
      archive-artifacts: ''
 +- project:
 +    name: ccsdk-platform-nbapi-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    project: 'ccsdk/platform/nbapi'
 +    project-name: 'ccsdk-platform-nbapi'
 +    branch: 'master'
 +    mvn-settings: 'ccsdk-platform-nbapi-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/ccsdk/sli-adaptors.yaml
index 33d5fbf,cc51531..38f44d3
--- 1/jjb/ccsdk/sli-adaptors.yaml
--- 2/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@@ -4,6 -4,7 +4,6 @@@
      project-name: 'ccsdk-sli-adaptors'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - '{project-name}-{stream}-release-version-java-daily'
@@@ -12,8 -13,6 +12,6 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'ccsdk-sli-adaptors-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
@@@ -23,14 -22,3 +21,14 @@@
      files: '**'
      archive-artifacts: ''
      build-node: ubuntu1604-basebuild-4c-4g
 +- project:
 +    name: ccsdk-sli-adaptors-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    project: 'ccsdk/sli/adaptors'
 +    project-name: 'ccsdk-sli-adaptors'
 +    branch: 'master'
 +    mvn-settings: 'ccsdk-sli-adaptors-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/ccsdk/sli-core.yaml
index 2b24923,16beca1..90d350a
--- 1/jjb/ccsdk/sli-core.yaml
--- 2/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@@ -4,6 -4,7 +4,6 @@@
      project-name: 'ccsdk-sli-core'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - '{project-name}-{stream}-release-version-java-daily'
@@@ -12,8 -13,6 +12,6 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'ccsdk-sli-core-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
@@@ -23,14 -22,3 +21,14 @@@
      files: '**'
      archive-artifacts: ''
      build-node: ubuntu1604-basebuild-4c-4g
 +- project:
 +    name: ccsdk-sli-core-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    project: 'ccsdk/sli/core'
 +    project-name: 'ccsdk-sli-core'
 +    branch: 'master'
 +    mvn-settings: 'ccsdk-sli-core-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/ccsdk/sli-northbound.yaml
index a0fc168,1f7c4a8..99f1d98
--- 1/jjb/ccsdk/sli-northbound.yaml
--- 2/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@@ -4,6 -4,7 +4,6 @@@
      project-name: 'ccsdk-sli-northbound'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - '{project-name}-{stream}-release-version-java-daily'
@@@ -12,8 -13,6 +12,6 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'ccsdk-sli-northbound-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
@@@ -23,14 -22,3 +21,14 @@@
      files: '**'
      archive-artifacts: ''
      build-node: ubuntu1604-basebuild-4c-4g
 +- project:
 +    name: ccsdk-sli-northbound-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    project: 'ccsdk/sli/northbound'
 +    project-name: 'ccsdk-sli-northbound'
 +    branch: 'master'
 +    mvn-settings: 'ccsdk-sli-northbound-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/ccsdk/sli-plugins.yaml
index 9187606,120ecec..e3d2d8e
--- 1/jjb/ccsdk/sli-plugins.yaml
--- 2/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@@ -4,6 -4,7 +4,6 @@@
      project-name: 'ccsdk-sli-plugins'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - '{project-name}-{stream}-release-version-java-daily'
@@@ -12,8 -13,6 +12,6 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'ccsdk-sli-plugins-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
@@@ -22,14 -21,3 +20,14 @@@
        deployAtEnd=true
      files: '**'
      archive-artifacts: ''
 +- project:
 +    name: ccsdk-sli-plugins-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    project: 'ccsdk/sli/plugins'
 +    project-name: 'ccsdk-sli-plugins'
 +    branch: 'master'
 +    mvn-settings: 'ccsdk-sli-plugins-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/ccsdk/storage-pgaas.yaml
index 7e1e8a1,ba8327a..c374a41
--- 1/jjb/ccsdk/storage-pgaas.yaml
--- 2/jjb/ccsdk/storage-pgaas.yaml
+++ b/jjb/ccsdk/storage-pgaas.yaml
@@@ -4,16 -4,15 +4,14 @@@
      project-name: 'ccsdk-storage-pgaas'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
 -      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
 +      - '{project-name}-{stream}-release-version-java-daily'
  
      project: 'ccsdk/storage/pgaas'
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'ccsdk-storage-pgaas-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
@@@ -22,14 -21,3 +20,14 @@@
        deployAtEnd=true
      files: '**'
      archive-artifacts: ''
 +- project:
 +    name: ccsdk-storage-pgaas-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    project: 'ccsdk/storage/pgaas'
 +    project-name: 'ccsdk-storage-pgaas'
 +    branch: 'master'
 +    mvn-settings: 'ccsdk-storage-pgaas-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/ccsdk/utils.yaml
index 6da9f41,6613e87..519e596
--- 1/jjb/ccsdk/utils.yaml
--- 2/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@@ -4,16 -4,15 +4,14 @@@
      project-name: 'ccsdk-utils'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
 -      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
 +      - '{project-name}-{stream}-release-version-java-daily'
  
      project: 'ccsdk/utils'
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'ccsdk-utils-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 --combined jjb/sdnc/sdnc-northbound.yaml
index c342094,24ceeb5..9f0dc40
--- 1/jjb/sdnc/sdnc-northbound.yaml
--- 2/jjb/sdnc/sdnc-northbound.yaml
+++ b/jjb/sdnc/sdnc-northbound.yaml
@@@ -4,6 -4,7 +4,6 @@@
      project-name: 'sdnc-northbound'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
        - '{project-name}-{stream}-release-version-java-daily'
@@@ -12,8 -13,6 +12,6 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'sdnc-northbound-settings'
  
      # due to a strange macro / variable translation problem this needs to be
@@@ -24,14 -23,3 +22,14 @@@
      files: '**'
      archive-artifacts: ''
      build-node: ubuntu1604-basebuild-4c-4g
 +- project:
 +    name: sdnc-northbound-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    project: 'sdnc/northbound'
 +    project-name: 'sdnc-northbound'
 +    branch: 'master'
 +    mvn-settings: 'sdnc-northbound-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/sdnc/sdnc-oam.yaml
index 17429bc,4f8a83f..7c098d7
--- 1/jjb/sdnc/sdnc-oam.yaml
--- 2/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@@ -5,9 -5,10 +5,9 @@@
      project-name: 'sdnc-oam'
      jobs:
        - gerrit-maven-clm:
 -          java-version: ''
        - '{project-name}-{stream}-verify-java'
        - '{project-name}-{stream}-merge-java'
 -      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
 +      - '{project-name}-{stream}-release-version-java-daily'
        - '{project-name}-{stream}-docker-java-daily':
            docker-pom: 'pom.xml'
            mvn-profile: 'docker'
@@@ -16,20 -17,7 +16,18 @@@
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'sdnc-oam-settings'
      files: '**'
      archive-artifacts: ''
      build-node: ubuntu1604-basebuild-4c-4g
 +- project:
 +    name: sdnc-oam-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    project: 'sdnc/oam'
 +    project-name: 'sdnc-oam'
 +    branch: 'master'
 +    mvn-settings: 'sdnc-oam-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'