Merge "Move tsdr Sonar scan to Sonarcloud"

diff --git a/jenkins-config/clouds/openstack/odlvex/cloud.cfg b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
index ff144c6ffc9b01bf04106fb8059ac62881a16eb6..cc3fc6521cbeed7f7921e01e15e709bf0be43643 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/cloud.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/cloud.cfg
@@ -1,6 +1,6 @@
 # Cloud Configuration
 CLOUD_CREDENTIAL_ID=os-cloud
-CLOUD_URL=https://auth.vexxhost.net/v3/
+CLOUD_URL=https://auth.vexxhost.net/v3
 CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 2819e2cb183b16ad95bcc9359763873562d837c7..4d2b6cfdbe1605ca7e9077dcf8843048c94d5b74 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -99,23 +99,6 @@
     mvn-settings: 'controller-settings'
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
-
-- project:
-    name: controller-sonarcloud
-    jobs:
-      - gerrit-maven-sonar:
-          mvn-params: >
-            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
-            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
-
-    project: 'controller'
-    project-name: 'controller-sonarcloud'
-    branch: master
-    build-node: centos7-builder-8c-8g
-    java-version: 'openjdk11'
-    mvn-settings: 'controller-settings'
-    mvn-goals: 'clean deploy -Pintegrationtests,docs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
     sonarcloud: true
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     sonarcloud-api-token: '{sonarcloud_api_token}'

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index 3f93d2cdf4432d05f6037bc9835f0323bf10ce86..f284cbb1fa3db72d5171520c6fb958bde47e731c 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -71,6 +71,10 @@
     build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: dluxapps-view

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index d44e686f977b12ffe714bda904be914a32d61c87..e3b6e55cb9bd4dbce1ee1d7e140c42bd89d27dc9 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -93,6 +93,10 @@
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: groupbasedpolicy-view

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index ed0ef380cc1ae38baeea7f50afba36f49f201068..d6278459213f99b7761463adab15439ca4c18458 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -198,6 +198,10 @@
     mvn-settings: integration-distribution-settings
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: distribution-view

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index ca8c2fd8bf733da45478c500ed6c48342b957533..24c8ef7f676567787772022efe73acd8fc456a56 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -82,6 +82,10 @@
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -Dmaven.compile.fork=true'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: l2switch-view

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index af6eb8c0ee73451afd5b3f45422244e5ae7e7545..93012b2b5409ccf099ff440bfcea8118c4884c1b 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -117,6 +117,10 @@
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: mdsal-view

diff --git a/jjb/odlguice/odlguice.yaml b/jjb/odlguice/odlguice.yaml
new file mode 100644 (file)
index 0000000..cfe818f
--- /dev/null
+++ b/jjb/odlguice/odlguice.yaml
@@ -0,0 +1,27 @@
+---
+- project:
+    name: odlguice
+    jobs:
+      - gerrit-release-merge
+      - gerrit-tox-verify
+
+    stream:
+      - aluminium:
+          branch: 'master'
+      - magnesium:
+          branch: 'stable/magnesium'
+
+    project: odlguice
+    project-name: odlguice
+    build-node: centos7-builder-2c-2g
+    build-timeout: 60
+    mvn-settings: 'odlguice-settings'
+
+    # Used by the release job
+    staging-profile-id: 44ce7d1aad49e
+
+- project:
+    name: odlguice-view
+    views:
+      - project-view
+    project-name: odlguice

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 65d658bbc0e6305fc58e790d0c8495ab2dcb53aa..f48a844967236d77f052ad24b8be42e214fea2b0 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -116,6 +116,10 @@
     java-version: 'openjdk11'
     mvn-settings: 'odlparent-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: odlparent-view

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index a4abe3060d1b05ad00a64b2dbaf9a967400d4ed3..1bec36cb0e0ba02a500e461baf6664d11a9b4dd9 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -67,6 +67,10 @@
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: of-config-view

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 4508aec638deb701f26af4bcfe350ca2279b4382..dd10741d8844ecc4fb72527c8afd47282636c348 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -67,6 +67,10 @@
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m'
     disable-job: true
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: packetcable-view

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index cbca6396b75fbb1b9e31ca4cced975ac41888150..b97c25f51f270eeabecb8f6cc85a5c749d19f81b 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -63,6 +63,10 @@
     branch: 'master'
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: snmp-view

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 358f7ead75e8c15070a472a3a967ea7aac777d79..58bb0ddc2787233408551f0fe3d6f194d3434ff1 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -79,6 +79,10 @@
     branch: 'master'
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: snmp4sdn-view

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 422729ebb75fba3b65bd109b8d5f17d3bb124447..8171e5bb2591ba64abbafd62294f3719f4aeb615 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -98,6 +98,10 @@
     java-version: 'openjdk11'
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
 
 - project:
     name: yangtools-view