Merge pull request #2658 from coolo/pkglistgen_two_steps

Pkglistgen in two steps

gocd/pkglistgen.opensuse.gocd.yaml

@@ -20,37 +20,51 @@ pipelines:
             resources:
             - repo-checker
             tasks:
-            - script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s target
+              - script: |
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s target --only-release-packages
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s target
           openSUSE_Factory_rings:
             resources:
             - repo-checker
             tasks:
-            - script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s rings
+              - script: |
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s rings --only-release-packages
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory -s rings
           openSUSE_Factory_ARM_target:
             resources:
             - repo-checker
             tasks:
-            - script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM -s target
+              - script: |
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM -s target --only-release-packages
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM -s target
           openSUSE_Factory_ARM_rings:
             resources:
             - repo-checker
             tasks:
-            - script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM -s rings
+              - script: |
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM -s rings --only-release-packages
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:ARM -s rings
           openSUSE_Factory_PowerPC:
             resources:
             - repo-checker
             tasks:
-            - script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:PowerPC
+              - script: |
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:PowerPC --only-release-packages
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:PowerPC
           openSUSE_Factory_zSystems:
             resources:
             - repo-checker
             tasks:
-            - script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:zSystems
+              - script: |
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:zSystems --only-release-packages
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:zSystems
           openSUSE_Factory_RISCV:
             resources:
             - repo-checker
             tasks:
-            - script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:RISCV
+              - script: |
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:RISCV --only-release-packages
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p openSUSE:Factory:RISCV
   Update.Repos.Factory:
     group: Factory.pkglistgen
     lock_behavior: unlockWhenFinished

gocd/pkglistgen.opensuse.gocd.yaml.erb

@@ -28,7 +28,9 @@ pipelines:
             resources:
             - repo-checker
             tasks:
-            - script: python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
+              - script: |
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %> --only-release-packages
+                  python3 -u ./pkglistgen.py -d -A https://api.opensuse.org update_and_solve -p <%= project[0] %><%= options %>
 <% end -%>
   Update.Repos.Factory:
     group: Factory.pkglistgen

pkglistgen/tool.py

@@ -684,7 +684,7 @@ class PkgListGen(ToolBase.ToolBase):
         if stop_after_solve:
             return
 
-        if drop_list:
+        if drop_list and not only_release_packages:
             weakremovers_file = os.path.join(release_dir, 'weakremovers.inc')
             self.create_weakremovers(project, target_config, oldrepos_dir, output=open(weakremovers_file, 'w'))