Merge "Upgrade to global-jjb v0.37.4"

diff --git a/.gitreview b/.gitreview
index 6b9c00d..333eca7 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=gerrit.oran-osc.org
+host=gerrit.o-ran-sc.org
 port=29418
 project=ci-management.git

diff --git a/README.md b/README.md
index ae43adc..c1d0e50 100644 (file)
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ Check sanity by running the Jenkins job-builder script in this directory:
 Login (after requesting membership in group
 oran-jenkins-sandbox-access) at the Jenkins sandbox:
 
-    https://jenkins.oran-osc.org/sandbox
+    https://jenkins.o-ran-sc.org/sandbox
 
 Get the authentication token from the sandbox:
     a) click on your user name (top right)
@@ -60,7 +60,7 @@ credentials (user name and API token from above)::
 
     [jenkins]
     query_plugins_info=False
-    url=https://jenkins.oran-osc.org/sandbox
+    url=https://jenkins.o-ran-sc.org/sandbox
     user=YOUR-USER-NAME
     password=YOUR-API-TOKEN
 

diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index 37ad72c..6a9547a 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -1,6 +1,8 @@
-GERRIT_URL=https://gerrit.oran-osc.org/r
-GIT_URL=ssh://oran-jobbuilder@gerrit.oran-osc.org:29418
+DOCKER_REGISTRY=nexus3.o-ran-sc.org
+GERRIT_URL=https://gerrit.o-ran-sc.org/r
+GIT_URL=ssh://oran-jobbuilder@gerrit.o-ran-sc.org:29418
 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
 SILO=production

diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index 51da462..3c782e2 100644 (file)
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -1,6 +1,8 @@
-GERRIT_URL=https://gerrit.oran-osc.org/r
-GIT_URL=ssh://oran-jobbuilder@gerrit.oran-osc.org:29418
+DOCKER_REGISTRY=nexus3.o-ran-sc.org
+GERRIT_URL=https://gerrit.o-ran-sc.org/r
+GIT_URL=ssh://oran-jobbuilder@gerrit.o-ran-sc.org:29418
 JENKINS_HOSTNAME=vex-sjc-oran-jenkins-sandbox-1
 LOGS_SERVER=https://logs.o-ran-sc.org
 NEXUS_URL=https://nexus.o-ran-sc.org
+REGISTRY_PORTS=10001 10002 10003 10004
 SILO=sandbox

diff --git a/jjb/ci-management/ci-jobs.yaml b/jjb/ci-management/ci-jobs.yaml
index df65f39..98012bf 100644 (file)
--- a/jjb/ci-management/ci-jobs.yaml
+++ b/jjb/ci-management/ci-jobs.yaml
@@ -27,6 +27,6 @@
     <<: *ci_jobs_common
 
     jenkins-urls: >
-        https://jenkins.oran-osc.org/
-        https://jenkins.oran-osc.org/sandbox
+        https://jenkins.o-ran-sc.org/
+        https://jenkins.o-ran-sc.org/sandbox
     openstack-cloud: vex

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index b381d2e..5297a60 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -5,7 +5,7 @@
     name: global
 
     # lf-infra-defaults
-    gerrit-server-name: gerrit.oran-osc.org
+    gerrit-server-name: gerrit.o-ran-sc.org
     jenkins-ssh-credential: jenkins
     lftools-version: <1.0.0
 

diff --git a/jjb/ric-dashboard/ric-dashboard.yaml b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
similarity index 59%
rename from jjb/ric-dashboard/ric-dashboard.yaml
rename to jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
index 59b132d..96924a6 100644 (file)
--- a/jjb/ric-dashboard/ric-dashboard.yaml
+++ b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
@@ -1,17 +1,17 @@
 ---
 - project:
-    name: ric-dashboard-project-view
-    project-name: ric-dashboard
+    name: portal-ric-dashboard-project-view
+    project-name: portal-ric-dashboard
     views:
       - project-view
 
 - project:
     name: portal-ric-dashboard-project
     # jenkins job name prefix
-    project-name: ric-dashboard
+    project-name: portal-ric-dashboard
     # git repo
     project: portal/ric-dashboard
-    mvn-settings: ric-dashboard-settings
+    mvn-settings: portal-ric-dashboard-settings
     mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
     nexus-iq-namespace: 'oran-'
     build-node: ubuntu1804-docker-4c-4g
@@ -19,7 +19,6 @@
       - gerrit-maven-docker-verify
       - gerrit-maven-docker-merge
       - gerrit-maven-docker-stage
-      - '{project-name}-maven-javadoc-jobs'
       # - gerrit-maven-clm
     stream:
       - master:
@@ -27,10 +26,15 @@
 
 - project:
     name: portal-ric-dashboard-sonar
-    project-name: ric-dashboard
+    project-name: portal-ric-dashboard
     project: portal/ric-dashboard
-    mvn-settings: ric-dashboard-settings
+    mvn-settings: portal-ric-dashboard-settings
     branch: master
     build-node: ubuntu1804-docker-4c-4g
     jobs:
       - gerrit-maven-sonar
+
+    sonarcloud: true
+    sonarcloud-project-key: o-ran-sc_portal-ric-dashboard
+    sonarcloud-project-organization: o-ran-sc
+    sonarcloud-api-token: d9e23c28dc39b6d7531d2ecabf122ce84e6253ef

diff --git a/tox.ini b/tox.ini
index e33d587..5ff30f8 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,7 @@ basepython = python3
 deps =
     coala==0.11
     coala-bears==0.11
+    pygments~=2.3.1
     nodeenv~=1.3.0
 commands =
     nodeenv -p