Merge "Remove jjb for repos for amsterdam release"

diff --combined jjb/dcaegen2/dcaegen2-analytics.yaml
index 5049193,27feb20..0f68fcf
--- 1/jjb/dcaegen2/dcaegen2-analytics.yaml
--- 2/jjb/dcaegen2/dcaegen2-analytics.yaml
+++ b/jjb/dcaegen2/dcaegen2-analytics.yaml
@@@ -5,14 -5,12 +5,12 @@@
      jobs:
        - '{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: 'dcaegen2/analytics'
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'dcaegen2-analytics-settings'
      # due to a strange macro / variable translation problem this needs
      # to be passed as a string block to properly get the properties
@@@ -22,15 -20,3 +20,15 @@@
      files: '**'
      archive-artifacts: ''
      build-node: 'ubuntu1604-docker-8c-8g'
 +- project:
 +    name: dcaegen2-analytics-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    java-version: ''
 +    project: 'dcaegen2/analytics'
 +    project-name: 'dcaegen2-analytics'
 +    branch: 'master'
 +    mvn-settings: 'dcaegen2-analytics-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
index add4238,1990c0c..35a5ec7
--- 1/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
--- 2/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml
@@@ -5,14 -5,12 +5,12 @@@
      jobs:
        - '{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: 'dcaegen2/collectors/snmptrap'
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
      # due to a strange macro / variable translation problem this needs
      # to be passed as a string block to properly get the properties
@@@ -22,15 -20,3 +20,15 @@@
      files: '**'
      archive-artifacts: ''
      build-node: 'ubuntu1604-docker-8c-8g'
 +- project:
 +    name: dcaegen2-collectors-snmptrap-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    java-version: ''
 +    project: 'dcaegen2/collectors/snmptrap'
 +    project-name: 'dcaegen2-collectors-snmptrap'
 +    branch: 'master'
 +    mvn-settings: 'dcaegen2-collectors-snmptrap-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/dcaegen2/dcaegen2-collectors.yaml
index 0a55b03,87e4fd4..d802d2b
--- 1/jjb/dcaegen2/dcaegen2-collectors.yaml
--- 2/jjb/dcaegen2/dcaegen2-collectors.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors.yaml
@@@ -5,14 -5,12 +5,12 @@@
      jobs:
        - '{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: 'dcaegen2/collectors'
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'dcaegen2-collectors-settings'
      # due to a strange macro / variable translation problem this needs
      # to be passed as a string block to properly get the properties
@@@ -22,15 -20,3 +20,15 @@@
      files: '**'
      archive-artifacts: ''
      build-node: 'ubuntu1604-docker-8c-8g'
 +- project:
 +    name: dcaegen2-collectors-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    java-version: ''
 +    project: 'dcaegen2/collectors'
 +    project-name: 'dcaegen2-collectors'
 +    branch: 'master'
 +    mvn-settings: 'dcaegen2-collectors-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/dcaegen2/dcaegen2-platform-cli.yaml
index e7e8241,043f40f..00cfddd
--- 1/jjb/dcaegen2/dcaegen2-platform-cli.yaml
--- 2/jjb/dcaegen2/dcaegen2-platform-cli.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml
@@@ -5,14 -5,12 +5,12 @@@
      jobs:
        - '{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: 'dcaegen2/platform/cli'
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'dcaegen2-platform-cli-settings'
      # due to a strange macro / variable translation problem this needs
      # to be passed as a string block to properly get the properties
@@@ -22,15 -20,3 +20,15 @@@
      files: '**'
      archive-artifacts: ''
      build-node: 'ubuntu1604-docker-8c-8g'
 +- project:
 +    name: dcaegen2-platform-cli-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    java-version: ''
 +    project: 'dcaegen2/platform/cli'
 +    project-name: 'dcaegen2-platform-cli'
 +    branch: 'master'
 +    mvn-settings: 'dcaegen2-platform-cli-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --combined jjb/dcaegen2/dcaegen2-platform.yaml
index cb7fd46,d1ce4a8..3142196
--- 1/jjb/dcaegen2/dcaegen2-platform.yaml
--- 2/jjb/dcaegen2/dcaegen2-platform.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform.yaml
@@@ -5,14 -5,12 +5,12 @@@
      jobs:
        - '{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: 'dcaegen2/platform'
      stream:
        - 'master':
            branch: 'master'
-       - 'amsterdam':
-           branch: 'amsterdam'
      mvn-settings: 'dcaegen2-platform-settings'
      # due to a strange macro / variable translation problem this needs
      # to be passed as a string block to properly get the properties
@@@ -21,15 -19,3 +19,15 @@@
        deployAtEnd=true
      files: '**'
      archive-artifacts: ''
 +- project:
 +    name: dcaegen2-platform-sonar
 +    jobs:
 +      - gerrit-maven-sonar
 +    build-node: ubuntu1604-basebuild-4c-4g
 +    java-version: ''
 +    project: 'dcaegen2/platform'
 +    project-name: 'dcaegen2-platform'
 +    branch: 'master'
 +    mvn-settings: 'dcaegen2-platform-settings'
 +    mvn-goals: 'clean install'
 +    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'