X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpti-o2%2Fpti-o2.yaml;h=790d4fecd8e34be67df143517b0ede8fd33bb223;hb=3ced11a2aea8b7cf99e93d25d512aaa0851d0404;hp=5f6e62f342ac48ad3678ed9991f0732cb11bb42a;hpb=067db59df08313a4227910da31323af96aa8226d;p=ci-management.git

diff --git a/jjb/pti-o2/pti-o2.yaml b/jjb/pti-o2/pti-o2.yaml
index 5f6e62f3..790d4fec 100644
--- a/jjb/pti-o2/pti-o2.yaml
+++ b/jjb/pti-o2/pti-o2.yaml
@@ -5,16 +5,7 @@
     views:
       - project-view
 
-- project:
-    name: pti-o2-info
-    project: pti/o2
-    project-name: pti-o2
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- pti_o2_common: &pti_o2_common
-    # values apply to all pti/o2 projects
+- _pti_o2_common: &pti_o2_common # values apply to all pti/o2 projects
     name: pti-o2-common
     # git repo
     project: pti/o2
@@ -23,8 +14,7 @@
     # maven settings file has credentials
     mvn-settings: pti-o2-settings
 
-- pti_o2_python: &pti_o2_python
-    # settings for python builds
+- _pti_o2_python: &pti_o2_python # settings for python builds
     name: pti-o2-python
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
@@ -33,46 +23,17 @@
     # no need to verify docs
     tox-envs: code,flake8
 
-- project:
-    <<: *pti_o2_common
-    <<: *pti_o2_python
-    name: pti-o2-imsdms-verify
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
-    jobs:
-      - gerrit-tox-verify
-    stream:
-      - 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_docker: &pti_o2_docker_common
     <<: *pti_o2_common
     # values apply to all pti/o2 docker projects
     # maven settings file has docker credentials
-    docker-name: 'o-ran-sc/pti-o2imsdms'
-    docker-build-args: '--network=host -f Dockerfile'
+    docker-name: "o-ran-sc/pti-o2imsdms"
+    docker-build-args: "--network=host -f Dockerfile"
     # source of docker tag
     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 +41,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 +58,17 @@
     # 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"
+
+- project:
+    <<: *pti_o2_docker_common
+    name: pti-o2-nexus-iq
+    build-node: centos7-builder-1c-1g
+    nexus-iq-namespace: oran-
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - gerrit-tox-nexus-iq-clm