Refactor!: Update JJB code to comply with 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 c3ae4b9..5f7839c 100644 (file)
--- a/jjb/com-pylog/com-pylog.yaml
+++ b/jjb/com-pylog/com-pylog.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- pylog_common: &pylog_common
+- _pylog_common: &pylog_common
     name: pylog-common
     # git repo
     project: com/pylog
@@ -38,6 +38,7 @@
           branch: master
     jobs:
       - gerrit-pypi-verify
+      - gerrit-pypi-merge
       - gerrit-pypi-stage
 
 - project:
@@ -53,7 +54,7 @@
     # do not trigger on changes in docs, releases
 
 
-- pylog_python: &pylog_python
+- _pylog_python: &pylog_python
     # settings for python builds
     name: com-pylog-python
     # the install script assumes an ubuntu image
@@ -67,8 +68,8 @@
 
 # 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: