Revert "Refactor!: Update JJB code to comply 5.x"

[ci-management.git] / jjb / smo-ves / smo-ves.yaml

diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml
index 44d5766..bb34461 100644 (file)
--- 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-collector
+    name: smo-ves-collector
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/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-adapter
+    name: smo-ves-dmaap-adapter
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/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-connector
+    name: smo-ves-influxdb-connector
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/smo-influxdb-connector'
+    docker-name: 'o-ran-sc/{name}'
     # Dockerfile is in a subdir
     docker-root: influxdb-connector
     # source of docker tag
@@ -72,10 +74,10 @@
           branch: master
 - project:
     <<: *ves_docker_common
-    name: smo-post-config
+    name: smo-ves-post-config
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/smo-post-config'
+    docker-name: 'o-ran-sc/{name}'
     # Dockerfile is in a subdir
     docker-root: postconfig
     # source of docker tag
@@ -88,37 +90,7 @@
 
 - project:
     <<: *ves_docker_common
-    name: smo-collector-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'
-
-- project:
-    <<: *ves_docker_common
-    name: smo-dmaap-adapter-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'
-
-- project:
-    <<: *ves_docker_common
-    name: smo-influxdb-connector-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'
-
-- project:
-    <<: *ves_docker_common
-    name: smo-post-config-release
+    name: smo-ves-release
     project-name: '{name}'
     # maven release requires sigul which requires centos
     # container release requires docker
@@ -155,4 +127,4 @@
       sonar.sources=collector
       sonar.python.coverage.reportPaths=coverage.xml
     jobs:
-      - gerrit-tox-sonar
+      - gerrit-cli-sonar