Merge "Revert "Add global read the docs jobs""

diff --git a/global-jjb b/global-jjb
index 0f5407d..e29ebcc 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 0f5407d52cb7483a04426c49defca6553ac01aaf
+Subproject commit e29ebcc2f6e802b2f9adc1f3ff421024625b076c

diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index 1106835..05b5a1a 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -5,6 +5,8 @@ JENKINS_HOSTNAME=vex-sjc-oran-jenkins-prod-1
 LOGS_SERVER=https://logs.o-ran-sc.org
 NEXUS_URL=https://nexus.o-ran-sc.org
 REGISTRY_PORTS=10001 10002 10003 10004
+RELEASE_EMAIL=collab-it+o-ran-sc-release@linuxfoundation.org
+RELEASE_USERNAME=o-ran-sc-release
 SIGUL_BRIDGE_IP=10.32.4.8
 SIGUL_KEY=oran-release-2019
 SILO=production

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 3145253..c89c6b5 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -46,3 +46,10 @@
     packagecloud-repo: staging
     debian-distribution-versions: debian/stretch
     rpm-distribution-versions: el/5
+
+    # Sonarcloud
+    sonarcloud_project_organization: o-ran-sc
+    sonarcloud_api_token: d9e23c28dc39b6d7531d2ecabf122ce84e6253ef
+
+    # Release config
+    jenkins-ssh-release-credential: jenkins-release

diff --git a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
index f7a1790..9374d8a 100644 (file)
--- a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
+++ b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
@@ -52,8 +52,8 @@
     mvn-goals: test
     branch: master
     sonarcloud: true
-    sonarcloud-project-key: o-ran-sc_portal-ric-dashboard
-    sonarcloud-project-organization: o-ran-sc
-    sonarcloud-api-token: d9e23c28dc39b6d7531d2ecabf122ce84e6253ef
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-maven-sonar

diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml
index ee92f64..a9118ea 100644 (file)
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -64,8 +64,8 @@
     pre-build-script: !include-raw-escape:
       - ../shell/install-deb-nng-rmr.sh
     sonarcloud: true
-    sonarcloud-project-key: o-ran-sc_ric-plt-a1
-    sonarcloud-project-organization: o-ran-sc
-    sonarcloud-api-token: d9e23c28dc39b6d7531d2ecabf122ce84e6253ef
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-tox-sonar

diff --git a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
index aa7bcdc..1571395 100644 (file)
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -82,3 +82,21 @@
     jobs:
       - gerrit-pypi-release-verify
       - gerrit-pypi-release-merge
+
+- project:
+    <<: *rmr_common
+    name: ric-plt-lib-rmr-python-sonar
+    project-name: ric-plt-lib-rmr-python
+    branch: master
+    python-version: python3
+    # the pre-build-script installs debian packages
+    build-node: ubuntu1804-builder-2c-2ga
+    # install prereqs
+    pre-build-script: !include-raw-escape: ../shell/install-deb-nng-rmr.sh
+    sonarcloud: true
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    tox-dir: src/bindings/rmr-python
+    jobs:
+      - gerrit-tox-sonar