X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsmo-ves%2Fsmo-ves.yaml;h=bb344615edf6820d68c55d2562a71790f01c7ef9;hb=8a14ce174d0665b867e62a9e52678cb8ec9009f1;hp=12d221e77897c55a81088e90fba2c2ae2c178a4d;hpb=0370d0aad5861f6465dbb6eeb4e6a5e6e69f5d8d;p=ci-management.git

diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml
index 12d221e7..bb344615 100644
--- a/jjb/smo-ves/smo-ves.yaml
+++ b/jjb/smo-ves/smo-ves.yaml
@@ -22,13 +22,15 @@
     project-name: smo-ves
     # maven settings file has docker credentials
     mvn-settings: smo-ves-settings
+    sonarcloud-project-key: "smo-ves"
+    sonarcloud-project-organization: "o-ran-sc"
 
 - project:
     <<: *ves_docker_common
-    name: smo-ves
+    name: smo-ves-collector
     project-name: '{name}'
     # image name
-    docker-name: 'smo-collector'
+    docker-name: 'o-ran-sc/{name}'
     # Dockerfile is in a subdir
     docker-root: collector
     # source of docker tag
@@ -41,10 +43,10 @@
 
 - project:
     <<: *ves_docker_common
-    name: smo-dmaap
+    name: smo-ves-dmaap-adapter
     project-name: '{name}'
     # image name
-    docker-name: 'smo-dmaap-adapter'
+    docker-name: 'o-ran-sc/{name}'
     # Dockerfile is in a subdir
     docker-root: dmaapadapter
     # source of docker tag
@@ -57,10 +59,10 @@
 
 - project:
     <<: *ves_docker_common
-    name: smo-influxdb
+    name: smo-ves-influxdb-connector
     project-name: '{name}'
     # image name
-    docker-name: 'smo-influxdb-connector'
+    docker-name: 'o-ran-sc/{name}'
     # Dockerfile is in a subdir
     docker-root: influxdb-connector
     # source of docker tag
@@ -70,20 +72,25 @@
     stream:
       - master:
           branch: master
-
 - project:
     <<: *ves_docker_common
-    name: smo-ves-release
+    name: smo-ves-post-config
     project-name: '{name}'
-    # maven release requires sigul which requires centos
-    # container release requires docker
-    build-node: centos7-docker-2c-8g
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # Dockerfile is in a subdir
+    docker-root: postconfig
+    # source of docker tag
+    container-tag-method: yaml-file
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
 
 - project:
     <<: *ves_docker_common
-    name: smo-dmaap-release
+    name: smo-ves-release
     project-name: '{name}'
     # maven release requires sigul which requires centos
     # container release requires docker
@@ -93,13 +100,11 @@
 
 - project:
     <<: *ves_docker_common
-    name: smo-influxdb-release
-    project-name: '{name}'
-    # maven release requires sigul which requires centos
-    # container release requires docker
-    build-node: centos7-docker-2c-8g
+    name: smo-ves-nexus-iq
+    build-node: centos7-builder-1c-1g
+    nexus-iq-namespace: oran-
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - gerrit-tox-nexus-iq-clm
 
 - project:
     <<: *ves_docker_common
@@ -107,8 +112,11 @@
     python-version: python3
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
-    # pre-build-script: !include-raw-escape:
-    #   - ../shell/install-deb-rmr.sh
+    #pre-build-script: !include-raw-escape:
+    #  - ../shell/install-deb-rmr.sh
+    # impt for verify and tox etc
+    tox-envs: code,flake8
+    sonarcloud: true
     sonar-project-file: ""
     sonar-properties: |
       sonar.login={sonarcloud_api_token}
@@ -116,7 +124,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-cli-sonar