Drop branch parameter from release-job projects

[ci-management.git] / jjb / ric-plt-a1 / ric-plt-a1.yaml

diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml
index 80a9262..81cf043 100644 (file)
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -25,14 +25,18 @@
 
 - project:
     <<: *a1_common
-    name: ric-plt-a1
+    name: ric-plt-a1-docker
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: 'o-ran-sc/ric-plt-a1'
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
     docker-build-args: '--network=host'
     build-node: ubuntu1804-docker-4c-4g
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+        - compare-type: REG_EXP
+          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     stream:
       - master:
           branch: master
@@ -45,8 +49,14 @@
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
     pre-build-script: !include-raw-escape:
-      - ../shell/install-deb-nng-rmr.sh
+      - ../shell/install-deb-rmr.sh
     python-version: python3
+    # skip docs on verify
+    tox-envs: code,flake8
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+        - compare-type: REG_EXP
+          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     stream:
       # run verify on all branches
       # the ANT pattern is **/{branch}, we are exploiting that.
@@ -57,23 +67,35 @@
 
 - project:
     <<: *a1_common
-    name: ric-plt-a1-sonar
+    name: ric-plt-a1-nexus-iq
+    build-node: centos7-builder-1c-1g
+    nexus-iq-namespace: oran-
+    jobs:
+      - gerrit-tox-nexus-iq-clm
+
+- project:
+    <<: *a1_common
+    name: ric-plt-a1-sonarqube
     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-nng-rmr.sh
-    sonarcloud: true
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+      - ../shell/install-deb-rmr.sh
+    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=a1
+        sonar.python.coverage.reportPaths=coverage.xml
     jobs:
-      - gerrit-tox-sonar
+      - gerrit-tox-sonarqube
 
 - project:
     <<: *a1_common
-    name: ricc-plt-a1-release
-    branch: master
+    name: ric-plt-a1-release
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g