Merge "Update JJB template for smo-ves"

diff --git a/global-jjb b/global-jjb
index 24d80c0..77f06cb 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 24d80c063923fc2ae4e76a5797ae471601c18569
+Subproject commit 77f06cb5e687962c7f999c80fbcf2a6b31042afd

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

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-app-rc-settings/content b/jenkins-config/managed-config-files/mavenSettings/ric-app-rc-settings/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-app-rc-settings/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file

diff --git a/jenkins-config/managed-config-files/mavenSettings/ric-app-rc-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/ric-app-rc-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..d7baae2
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/ric-app-rc-settings/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/serverCredentialMappings.sandbox.yaml
\ No newline at end of file

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

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 0bfaf2c..415f417 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -187,6 +187,35 @@
       - e-release:
           branch: e-release
 
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-dmaap-mediator-producer
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-dmaap-mediator-producer'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: 'dmaap-mediator-producer'
+    # Directory where go test should be run
+    go-root: 'test/usecases/dmaap-mediator-producer'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'dmaap-mediator-producer/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+      - e-release:
+          branch: e-release
+
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-dmaap-mediator-producer-sonar
@@ -269,6 +298,64 @@
       - e-release:
           branch: e-release
 
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-o-ru-closed-loop-consumer
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-o-ru-closed-loop-consumer'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: 'test/usecases/oruclosedlooprecovery/goversion'
+    # Directory where go test should be run
+    go-root: 'test/usecases/oruclosedlooprecovery/goversion'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'test/usecases/oruclosedlooprecovery/goversion/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+      - e-release:
+          branch: e-release
+
+- project:
+    <<: *nonrtric_jdk_common
+    name: nonrtric-o-du-slice-assurance
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nonrtric-o-du-slice-assurance'
+    # get tag from YAML
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # Directory with Dockerfile
+    docker-root: 'test/usecases/odusliceassurance/goversion'
+    # Directory where go test should be run
+    go-root: 'test/usecases/odusliceassurance/goversion'
+    # Limit build trigger to appropriate files
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'test/usecases/odusliceassurance/goversion/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    # Includes verify and merge jobs
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
+      - gerrit-go-verify
+    stream:
+      - master:
+          branch: master
+      - e-release:
+          branch: e-release
+
 - project:
     <<: *nonrtric_jdk_common
     name: nonrtric-o-ru-closed-loop-consumer-sonar

diff --git a/jjb/pti-o2/pti-o2.yaml b/jjb/pti-o2/pti-o2.yaml
index 5f6e62f..5ff1747 100644 (file)
--- a/jjb/pti-o2/pti-o2.yaml
+++ b/jjb/pti-o2/pti-o2.yaml
@@ -47,22 +47,6 @@
       - master:
           branch: master
 
-- project:
-    <<: *pti_o2_common
-    <<: *pti_o2_python
-    name: pti-o2-imsdms-sonarqube
-    sonar-project-file: ""
-    sonar-properties: |
-        sonar.login={sonarcloud_api_token}
-        sonar.projectKey={sonarcloud_project_organization}_{project-name}
-        sonar.projectName={project-name}
-        sonar.organization={sonarcloud_project_organization}
-        sonar.build.sourceEncoding=UTF-8
-        sonar.sources=src
-        sonar.python.coverage.reportPaths=coverage.xml
-    jobs:
-      - gerrit-tox-sonarqube
-
 - pti_o2_docker: &pti_o2_docker_common
     <<: *pti_o2_common
     # values apply to all pti/o2 docker projects
@@ -73,6 +57,7 @@
     container-tag-method: yaml-file
     # docker-root: src
     # if no container-tag-yaml-dir is defined, container-tag.yml is taken from the docker-root
+    container-tag-yaml-dir: stages
     build-node: ubuntu1804-docker-4c-4g
     stream:
       - master:
@@ -80,13 +65,16 @@
 
 - project:
     <<: *pti_o2_docker_common
-    name: pti-o2-imsdms-docker-verify
-    # jenkins job name prefix
-    project-name: '{name}'
-    container-tag-method: latest
-    docker-build-args: '--network=host -f Dockerfile'
+    name: pti-o2-imsdms
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+        - compare-type: REG_EXP
+          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
-      - gerrit-docker-verify
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
 
 - project:
     <<: *pti_o2_docker_common
@@ -94,9 +82,9 @@
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g
-    container-tag-yaml-dir: release
+    container-tag-yaml-dir: releases
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'release/.*'
+        pattern: 'releases\/.*\.yaml'
     jobs:
       - '{project-name}-gerrit-release-jobs'

diff --git a/jjb/ric-app-rc/ric-app-rc.yaml b/jjb/ric-app-rc/ric-app-rc.yaml
new file mode 100644 (file)
index 0000000..273a25a
--- /dev/null
+++ b/jjb/ric-app-rc/ric-app-rc.yaml
@@ -0,0 +1,55 @@
+---
+- project:
+    name: ric-app-rc-project-view
+    project-name: ric-app-rc
+    views:
+      - project-view
+
+- rc_common: &rc_common
+    # values apply to all projects
+    name: rc-common
+    # git repo
+    project: ric-app/rc
+    # jenkins prefix
+    project-name: ric-app-rc
+    # maven settings file has docker credentials
+    mvn-settings: ric-app-rc-settings
+
+# verify INFO.yaml changes
+- project:
+    <<: *rc_common
+    name: ric-app-rc-info
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+# create docker image when source changes
+- project:
+    <<: *rc_common
+    # also used as image name
+    name: ric-app-rc
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # source type of image tag
+    container-tag-method: yaml-file
+    # use host network
+    docker-build-args: '--network=host'
+    # trigger on any change other than a file in ./docs
+    gerrit_trigger_file_paths:
+        - compare-type: REG_EXP
+          pattern: '^((?!docs/|\/COMMIT_MSG).)*$'
+    jobs:
+        - '{project-name}-gerrit-docker-jobs'
+    stream:
+        - master:
+            branch: master
+
+# push nexus image from staging to release
+- project:
+    <<: *rc_common
+    name: ric-app-rc-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'