Merge "Migrate AAI to SonarCloud"
diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
index 4f51f2b..fc12da4 100644
--- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
+++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml
@@ -2,6 +2,7 @@
- project:
name: dcaegen2-collectors-ves
project-name: 'dcaegen2-collectors-ves'
+ java-version: openjdk11
jobs:
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
index 0da5dd2..b2c091f 100644
--- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml
@@ -35,8 +35,7 @@
- 'master':
branch: 'master'
mvn-settings: 'dcaegen2-services-sdk-settings'
- mvn-goals: 'clean install'
- mvn-opts: ' -P integration-pairwise'
+ mvn-params: ' -P integration-pairwise'
- project:
name: dcaegen2-services-sdk-sonar
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index 5bbaae3..a4ac621 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -38,6 +38,11 @@
name: music-sonar
jobs:
- gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'music'
diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
index caf4de5..3bee2b1 100644
--- a/jjb/optf/optf-cmso.yaml
+++ b/jjb/optf/optf-cmso.yaml
@@ -45,6 +45,11 @@
jobs:
- gerrit-maven-sonar:
mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001 -DskipIntegrationTests=false'
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: 'H 11 * * *'
build-node: ubuntu1604-docker-8c-8g
project: 'optf/cmso'
diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml
index 6367d62..7c5718a 100644
--- a/jjb/optf/optf-fgps.yaml
+++ b/jjb/optf/optf-fgps.yaml
@@ -85,6 +85,11 @@
name: optf-fgps-sonar
jobs:
- gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'optf/fgps'
diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index 9025398..f08d7f9 100644
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -73,6 +73,11 @@
name: optf-has-sonar
jobs:
- gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'optf/has'
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index a9463ff..d5bcf23 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -71,6 +71,11 @@
name: optf-osdf-sonar
jobs:
- gerrit-maven-sonar
+ sonarcloud: true
+ sonarcloud-project-organization: '{sonarcloud_project_organization}'
+ sonarcloud-api-token: '{sonarcloud_api_token}'
+ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+ sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
cron: '@daily'
build-node: ubuntu1604-builder-4c-4g
project: 'optf/osdf'
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index df914f7..63daef9 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -85,24 +85,6 @@
build-node: ubuntu1604-builder-4c-4g
- project:
- name: policy-docker-sonar
- jobs:
- - gerrit-maven-sonar
- sonarcloud: true
- sonarcloud-project-organization: '{sonarcloud_project_organization}'
- sonarcloud-api-token: '{sonarcloud_api_token}'
- sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
- sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
- cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
- project: 'policy/docker'
- project-name: 'policy-docker'
- branch: 'master'
- mvn-settings: 'policy-docker-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
name: policy-docker-clm
jobs:
- gerrit-maven-clm
diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml
index a928081..10c3c40 100644
--- a/packer/provision/local-builder.yaml
+++ b/packer/provision/local-builder.yaml
@@ -6,6 +6,18 @@
become_method: sudo
tasks:
+ - apt_repository:
+ repo: ppa:jonathonf/python-3.6
+ state: present
+ become: true
+ when: ansible_distribution == 'Ubuntu'
+
+ - apt_repository:
+ repo: ppa:deadsnakes/ppa
+ state: present
+ become: true
+ when: ansible_distribution == 'Ubuntu'
+
- name: Update and upgrade apt packages
apt:
upgrade: yes
@@ -19,12 +31,6 @@
state: present
become: true
- - apt_repository:
- repo: ppa:jonathonf/python-3.6
- state: present
- become: true
- when: ansible_distribution == 'Ubuntu'
-
- name: Install Python 3.6 and packages
apt:
name:
@@ -37,6 +43,15 @@
become: true
when: ansible_distribution == 'Ubuntu'
+ - name: Install Python 3.7
+ apt:
+ name:
+ - python3.7
+ - python3.7-dev
+ - python3.7-tk
+ become: true
+ when: ansible_distribution == 'Ubuntu'
+
- name: Install base packages
apt:
name:
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index 76e0cbb..c3c9f17 100644
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -72,6 +72,12 @@
become: true
when: ansible_distribution == 'Ubuntu'
+ - apt_repository:
+ repo: ppa:deadsnakes/ppa
+ state: present
+ become: true
+ when: ansible_distribution == 'Ubuntu'
+
- name: Update and upgrade apt packages
apt:
upgrade: yes
@@ -91,6 +97,15 @@
become: true
when: ansible_distribution == 'Ubuntu'
+ - name: Install Python 3.7
+ apt:
+ name:
+ - python3.7
+ - python3.7-dev
+ - python3.7-tk
+ become: true
+ when: ansible_distribution == 'Ubuntu'
+
- name: Install base packages
apt:
name: