X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fcom-pylog%2Fcom-pylog.yaml;h=c3ae4b9097332da0a665605bdff1789b90c7d428;hb=refs%2Fheads%2Fmaster;hp=45a391fbb823b01b12c52c5db13e7886dcf595a9;hpb=c445f72ba18aa2e6db2d0d27f2e0a3ba34adddd0;p=ci-management.git

diff --git a/jjb/com-pylog/com-pylog.yaml b/jjb/com-pylog/com-pylog.yaml
index 45a391fb..c619ffc9 100644
--- a/jjb/com-pylog/com-pylog.yaml
+++ b/jjb/com-pylog/com-pylog.yaml
@@ -5,15 +5,7 @@
     views:
       - project-view
 
-- project:
-    name: com-pylog-info
-    project: com/pylog
-    project-name: com-pylog
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- pylog_common: &pylog_common
+- _pylog_common: &pylog_common
     name: pylog-common
     # git repo
     project: com/pylog
@@ -32,12 +24,13 @@
     tox-dir: mdclogpy
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'mdclogpy/.*'
+        pattern: "mdclogpy/.*"
     stream:
       - master:
           branch: master
     jobs:
       - gerrit-pypi-verify
+      - gerrit-pypi-merge
       - gerrit-pypi-stage
 
 - project:
@@ -48,13 +41,11 @@
     # source of docker tag
     container-tag-method: yaml-file
     # use host network
-    docker-build-args: '--network=host'
+    docker-build-args: "--network=host"
     build-node: centos7-docker-2c-8g
     # do not trigger on changes in docs, releases
 
-
-- pylog_python: &pylog_python
-    # settings for python builds
+- _pylog_python: &pylog_python # settings for python builds
     name: com-pylog-python
     # the install script assumes an ubuntu image
     build-node: ubuntu1804-builder-2c-2g
@@ -64,20 +55,17 @@
     tox-envs: py3
     tox-dir: mdclogpy
 
-
 # promote package from test.pypi.org to pypi.org
 - project:
-    <<: *pylog_common
     <<: *pylog_python
+    <<: *pylog_common
     name: pylog-pypi-release
     # do not trigger on changes in docs, releases
     gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
-    jobs:
-      - '{project-name}-gerrit-pypi-release-jobs'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
-      - gerrit-tox-verify
+      - "{project-name}-gerrit-pypi-release-jobs"
     stream:
       - master:
           branch: master
@@ -88,12 +76,12 @@
     name: com-pylog-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=mdclogpy
-        sonar.python.coverage.reportPaths=$TOX_DIR/coverage.xml
+      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=mdclogpy
+      sonar.python.coverage.reportPaths=$TOX_DIR/coverage.xml
     jobs:
       - gerrit-tox-sonarqube