From: Aric Gardner <agardner@linuxfoundation.org>
Date: Fri, 4 Jun 2021 15:35:55 +0000 (-0400)
Subject: add merge job
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=ca02d1aa61fc1019d0a45e53720294c72e18c32f;p=ci-management.git

add merge job

fix oder of operations so that builder is centos
for release job

IT-22191

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: I0410a90292a32bf62ba628d9d63389ef0ab25af2
---

diff --git a/jjb/com-pylog/com-pylog.yaml b/jjb/com-pylog/com-pylog.yaml
index c3ae4b90..115b6249 100644
--- a/jjb/com-pylog/com-pylog.yaml
+++ b/jjb/com-pylog/com-pylog.yaml
@@ -38,6 +38,7 @@
           branch: master
     jobs:
       - gerrit-pypi-verify
+      - gerrit-pypi-merge
       - gerrit-pypi-stage
 
 - project:
@@ -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: