Revert "Refactor!: Update JJB code to comply 5.x"

[ci-management.git] / jjb / com-pylog / com-pylog.yaml

diff --git a/jjb/com-pylog/com-pylog.yaml b/jjb/com-pylog/com-pylog.yaml
index 83f2a3b..115b624 100644 (file)
--- a/jjb/com-pylog/com-pylog.yaml
+++ b/jjb/com-pylog/com-pylog.yaml
@@ -30,6 +30,16 @@
     name: pylog-pypi
     # the code is in a subdirectory
     tox-dir: mdclogpy
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'mdclogpy/.*'
+    stream:
+      - master:
+          branch: master
+    jobs:
+      - gerrit-pypi-verify
+      - gerrit-pypi-merge
+      - gerrit-pypi-stage
 
 - project:
     <<: *pylog_common
@@ -43,15 +53,6 @@
     build-node: centos7-docker-2c-8g
     # do not trigger on changes in docs, releases
 
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'mdclogpy/.*'
-    stream:
-      - master:
-          branch: master
-    jobs:
-      - gerrit-pypi-verify
-      - gerrit-pypi-stage
 
 - pylog_python: &pylog_python
     # settings for python builds
@@ -67,16 +68,15 @@
 
 # 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).)*$'
+      - compare-type: REG_EXP
+        pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
       - '{project-name}-gerrit-pypi-release-jobs'
-    jobs:
       - gerrit-tox-verify
     stream:
       - master: