Merge "Automation adds ric-plt-ricdms.yaml"

diff --git a/jenkins-config/managed-config-files/mavenSettings/pti-o2-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/pti-o2-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..e631829
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/pti-o2-settings/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "pti-o2-settings"
+comment: "pti-o2-settings"

diff --git a/jenkins-config/managed-config-files/mavenSettings/pti-o2-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/pti-o2-settings/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..0690aea
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/pti-o2-settings/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - credentialsId: "pti-o2"
+    serverId: "releases"
+  - credentialsId: "pti-o2"
+    serverId: "staging"
+  - credentialsId: "pti-o2"
+    serverId: "site"
+  - credentialsId: "pti-o2"
+    serverId: "snapshots"
+  - credentialsId: "docker"
+    serverId: "nexus3.o-ran-sc.org:10001"
+  - credentialsId: "pti-o2"
+    serverId: "nexus3.o-ran-sc.org:10002"
+  - credentialsId: "pti-o2"
+    serverId: "nexus3.o-ran-sc.org:10003"
+  - credentialsId: "pti-o2"
+    serverId: "nexus3.o-ran-sc.org:10004"

diff --git a/jjb/it-dep/it-dep.yaml b/jjb/it-dep/it-dep.yaml
index d1bae14..56d9b9e 100644 (file)
--- a/jjb/it-dep/it-dep.yaml
+++ b/jjb/it-dep/it-dep.yaml
@@ -48,6 +48,27 @@
       - all:
           branch: '*'
 
+- project:
+    <<: *it_dep_common
+    # Verify helm charts using a Docker build process.
+    # no image needs to be pushed, so there is no merge job.
+    name: it-dep-smo-install
+    # jenkins job name prefix
+    build-timeout: 120
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # dockerfile is in subdir
+    docker-build-args: -f ci/Dockerfile-smo-install
+    # any tag will do
+    container-tag-method: latest
+    submodule-disable: true
+    jobs:
+      - gerrit-docker-verify
+    stream:
+      - all:
+          branch: '*'
+
 # build and publish packages to PackageCloud.io
 - project:
     <<: *it_dep_common

diff --git a/jjb/it-dev/it-dev-docker.yaml b/jjb/it-dev/it-dev-docker.yaml
index a2311d9..7cf1590 100644 (file)
--- a/jjb/it-dev/it-dev-docker.yaml
+++ b/jjb/it-dev/it-dev-docker.yaml
@@ -54,3 +54,7 @@
 - project:
     name: bldr-ubuntu18-c-go
     <<: *it_dev_docker_common
+
+- project:
+    name: bldr-ubuntu20-c-go
+    <<: *it_dev_docker_common

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index c7a0b7a..7b22e9d 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -24,9 +24,16 @@
     mvn-version: mvn36
     java-version: openjdk11
 
+# nonrtric:policy-agent
+# Docker image for nonrtric-policy-agent
 - project:
     <<: *nonrtric_jdk_common
-    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+    name: nonrtric-policy-agent-docker
+    project-name: '{name}'
+    mvn-params: '-f policy-agent/pom.xml -Dbuild.number=${{BUILD_NUMBER}}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'policy-agent/.*'
     jobs:
       - gerrit-maven-docker-verify
       - gerrit-maven-docker-merge
@@ -64,6 +71,28 @@
       - dawn:
           branch: dawn
 
+# nonrtric:sdnc-a1-controller
+# Docker image for nonrtric-sdnc-a1-controller
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-sdnc-a1-controller-docker
+    project-name: '{name}'
+    mvn-params: '-f sdnc-a1-controller/pom.xml -Dbuild.number=${{BUILD_NUMBER}}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'sdnc-a1-controller/.*'
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+      - cherry:
+          branch: cherry
+      - dawn:
+          branch: dawn
+
 # nonrtric:sdnc-a1-controller
 # Maven artifacts for nonrtric-sdnc-a1-controller
 - project:
@@ -89,6 +118,28 @@
       - dawn:
           branch: dawn
 
+# nonrtric:enrichment-coordinator-service
+# Docker image for nonrtric-enrichment-coordinator-service
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-enrichment-coordinator-service-docker
+    project-name: '{name}'
+    mvn-params: '-f enrichment-coordinator-service/pom.xml -Dbuild.number=${{BUILD_NUMBER}}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'enrichment-coordinator-service/.*'
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+      - cherry:
+          branch: cherry
+      - dawn:
+          branch: dawn
+
 # nonrtric:enrichment-coordinator-service
 # Maven artifacts for nonrtric-enrichment-coordinator-service
 - project:
@@ -114,6 +165,28 @@
       - dawn:
           branch: dawn
 
+# nonrtric:r-app-catalogue
+# Docker image for nonrtric-r-app-catalogue
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-r-app-catalogue-docker
+    project-name: '{name}'
+    mvn-params: '-f r-app-catalogue/pom.xml -Dbuild.number=${{BUILD_NUMBER}}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'r-app-catalogue/.*'
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+      - cherry:
+          branch: cherry
+      - dawn:
+          branch: dawn
+
 # nonrtric:r-app-catalogue
 # Maven artifacts for r-app-catalogue
 - project:
@@ -139,6 +212,26 @@
       - dawn:
           branch: dawn
 
+# nonrtric:helm-manager
+# Docker image for nonrtric-helm-manager
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-helm-manager-docker
+    project-name: '{name}'
+    mvn-params: '-f helm-manager/pom.xml -Dbuild.number=${{BUILD_NUMBER}}'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'helm-manager/.*'
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+      - dawn:
+          branch: dawn
+
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-o-ru-closed-loop-recovery
@@ -271,9 +364,9 @@
         # Unit tests
         sonar.go.coverage.reportPaths=test/usecases/oruclosedlooprecovery/goversion/coverage.txt
         # Inclusions
-        sonar.inclusions=test/usecases/oruclosedlooprecovery/goversion/internal/**/**.go
+        sonar.inclusions=test/usecases/oruclosedlooprecovery/goversion/internal/**/**.go,test/usecases/oruclosedlooprecovery/goversion/**.go
         # Exclusions
-        sonar.exclusions=test/usecases/oruclosedlooprecovery/goversion/main.go,test/usecases/oruclosedlooprecovery/goversion/mocks/**.go,test/usecases/oruclosedlooprecovery/goversion/internal/**/**_test.go
+        sonar.exclusions=test/usecases/oruclosedlooprecovery/goversion/mocks/**.go,test/usecases/oruclosedlooprecovery/goversion/internal/**/**_test.go,test/usecases/oruclosedlooprecovery/goversion/simulator/**.go
     jobs:
       - gerrit-sonar-prescan-script
 

diff --git a/jjb/ric-plt-ricctl/ric-plt-ricctl.yaml b/jjb/ric-plt-ricctl/ric-plt-ricctl.yaml
new file mode 100644 (file)
index 0000000..a68627f
--- /dev/null
+++ b/jjb/ric-plt-ricctl/ric-plt-ricctl.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: ric-plt-ricctl-project-view
+    project-name: ric-plt-ricctl
+    views:
+      - project-view
+
+- project:
+    name: ric-plt-ricctl-info
+    project: ric-plt/ricctl
+    project-name: ric-plt-ricctl
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify