Refactor!: Update JJB code to comply with 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 137760a..99b72ab 100644 (file)
--- a/jjb/smo-ves/smo-ves.yaml
+++ b/jjb/smo-ves/smo-ves.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- ves_docker_common: &ves_docker_common
+- _ves_docker_common: &ves_docker_common
     # values apply to all docker projects
     name: ves-docker-common
     # git repo
@@ -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
@@ -72,10 +74,10 @@
           branch: master
 - project:
     <<: *ves_docker_common
-    name: smo-postconfig
+    name: smo-ves-post-config
     project-name: '{name}'
     # image name
-    docker-name: 'smo-post-config'
+    docker-name: 'o-ran-sc/{name}'
     # Dockerfile is in a subdir
     docker-root: postconfig
     # source of docker tag
@@ -98,23 +100,11 @@
 
 - project:
     <<: *ves_docker_common
-    name: smo-dmaap-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-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
@@ -122,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}
@@ -134,4 +127,4 @@
       sonar.sources=collector
       sonar.python.coverage.reportPaths=coverage.xml
     jobs:
-      - gerrit-tox-sonarqube
+      - gerrit-cli-sonar