Merge "pti-rtp: update for the upload images change"

diff --git a/jjb/sim-ns3-o-ran-e2/sim-ns3-o-ran-e2.yaml b/jjb/sim-ns3-o-ran-e2/sim-ns3-o-ran-e2.yaml
new file mode 100644 (file)
index 0000000..cf72e52
--- /dev/null
+++ b/jjb/sim-ns3-o-ran-e2/sim-ns3-o-ran-e2.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+    name: sim-ns3-o-ran-e2-project-view
+    project-name: sim-ns3-o-ran-e2
+    views:
+      - project-view
+
+- project:
+    name: sim-ns3-o-ran-e2-info
+    project: sim/ns3-o-ran-e2
+    project-name: sim-ns3-o-ran-e2
+    build-node: centos7-builder-1c-1g
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify
\ No newline at end of file

diff --git a/jjb/smo-o2/smo-o2.yaml b/jjb/smo-o2/smo-o2.yaml
new file mode 100644 (file)
index 0000000..3fdb5ca
--- /dev/null
+++ b/jjb/smo-o2/smo-o2.yaml
@@ -0,0 +1,34 @@
+---
+- project:
+    name: smo-o2-project-view
+    project-name: smo-o2
+    views:
+      - project-view
+
+- project:
+    name: smo-o2-info
+    project: smo/o2
+    project-name: smo-o2
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- smo_o2_docker_common: &smo_o2_docker_common
+    # values apply to all docker projects
+    name: smo-o2-docker-common
+    # git repo
+    project: smo/o2
+    # jenkins job name prefix
+    project-name: smo-o2
+    # maven settings file has docker credentials
+    mvn-settings: smo-o2-settings
+
+- project:
+    <<: *smo_o2_docker_common
+    name: smo-o2-release
+    project-name: '{name}'
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'

diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml
index 12d221e..137760a 100644 (file)
--- a/jjb/smo-ves/smo-ves.yaml
+++ b/jjb/smo-ves/smo-ves.yaml
@@ -70,6 +70,21 @@
     stream:
       - master:
           branch: master
+- project:
+    <<: *ves_docker_common
+    name: smo-postconfig
+    project-name: '{name}'
+    # image name
+    docker-name: 'smo-post-config'
+    # Dockerfile is in a subdir
+    docker-root: postconfig
+    # source of docker tag
+    container-tag-method: yaml-file
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
 
 - project:
     <<: *ves_docker_common
@@ -116,7 +131,7 @@
       sonar.projectName={project-name}
       sonar.organization={sonarcloud_project_organization}
       sonar.build.sourceEncoding=UTF-8
-      sonar.sources=a1
+      sonar.sources=collector
       sonar.python.coverage.reportPaths=coverage.xml
-      jobs:
-        - gerrit-tox-sonarqube
+    jobs:
+      - gerrit-tox-sonarqube