X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-rappcatalogue%2Fnonrtric-plt-rappcatalogue.yaml;h=bb932e68d77fbdf0e1a349700429a62325e74883;hb=refs%2Fheads%2Fmaster;hp=d64985204a26d6502ef12b506252cc942fd5e62a;hpb=9199e5585cc3cbb679f6d3f72a5e3d3aa05759f6;p=ci-management.git

diff --git a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
index d6498520..bb932e68 100644
--- a/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
+++ b/jjb/nonrtric-plt-rappcatalogue/nonrtric-plt-rappcatalogue.yaml
@@ -5,14 +5,6 @@
     views:
       - project-view
 
-- project:
-    name: nonrtric-plt-rappcatalogue-info
-    project: nonrtric/plt/rappcatalogue
-    project-name: nonrtric-plt-rappcatalogue
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
 - _rappcatalogue_jdk_common: &rappcatalogue_jdk_common
     name: rappcatalogue-jdk-common
     # git repo
@@ -77,19 +69,6 @@
     jobs:
       - "{project-name}-gerrit-release-jobs"
 
-- project:
-    <<: *rappcatalogue_jdk_common
-    name: nonrtric-plt-rappcatalogue-sonar
-    project-name: nonrtric-plt-rappcatalogue
-    # template goal install builds docker image unnecessarily
-    mvn-params: "-Ddocker.skip=true"
-    sonarcloud: true
-    sonarcloud-api-token: "{sonarcloud_api_token}"
-    sonarcloud-project-key: "nonrtric_plt_rappcatalogue"
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    jobs:
-      - gerrit-maven-sonar
-
 - project:
     <<: *rappcatalogue_jdk_common
     name: nonrtric-plt-rappcatalogue-enhanced-verify
@@ -105,12 +84,12 @@
       - compare-type: REG_EXP
         pattern: "catalogue-enhanced/.*"
     stream:
-      - master:
-          branch: master
-      - g-release:
-          branch: g-release
       - h-release:
           branch: h-release
+      - i-release:
+          branch: i-release
+      - j-release:
+          branch: j-release
     jobs:
       - gerrit-tox-verify
 
@@ -134,35 +113,11 @@
     stream:
       - master:
           branch: master
-      - g-release:
-          branch: g-release
       - h-release:
           branch: h-release
+      - i-release:
+          branch: i-release
+      - j-release:
+          branch: j-release
     jobs:
       - "{project-name}-gerrit-docker-jobs"
-
-- project:
-    <<: *rappcatalogue_jdk_common
-    name: nonrtric-plt-rappcatalogue-enhanced-sonarqube
-    project-name: nonrtric-plt-rappcatalogue-enhanced
-    python-version: python3
-    tox-dir: catalogue-enhanced
-    # the install script assumes an ubuntu image
-    build-node: ubuntu1804-builder-2c-2g
-    # do not trigger on changes in docs, releases
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: "catalogue-enhanced/.*"
-    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=catalogue-enhanced/
-      sonar.python.coverage.reportPaths=catalogue-enhanced/coverage.xml
-      sonar.inclusions=catalogue-enhanced/src/**.py
-      sonar.exclusions=catalogue-enhanced/tests/**.py
-    jobs:
-      - gerrit-tox-sonarqube