Add yaml generator, sync from upstream

generate-prepop-yaml

@@ -0,0 +1,2 @@
+#!/bin/bash
+cat prepopulate.json | python -c 'import sys, yaml, json; print(yaml.dump(json.loads(sys.stdin.read())))' > prepopulate.yaml

shared/additional_and_filter_packages.conf

@@ -49,6 +49,7 @@ additional_packages = [
     ("^BaseOS$", {
         "*": [
             "python3.*-debuginfo", #ENGCMP-1433
+            "subscription-manager-rhsm-certificates" #ENGCMP-2357
         ]
     }),
     ("^BaseOS$", {
@@ -68,7 +69,9 @@ additional_packages = [
             "libzdnn", #ENGCMP-2244
             "libzdnn-devel", #ENGCMP-2297
             "mkpasswd", #ENGCMP-2259
+            "libnvme", #ENGCMP-2358
             "python3-dnf-plugin-modulesync", #ENGCMP-2323
+            "python3-pyqt5-sip", #ENGCMP-2370
             "python3-wcwidth", #ENGCMP-2093
             "sip6", #ENGCMP-2239
             "sssd-idp", #ENGCMP-2276
@@ -76,6 +79,7 @@ additional_packages = [
             "tuned-profiles-postgresql", #ENGCMP-2126
             "xdg-desktop-portal-gnome", #ENGCMP-2146
             "xmlstarlet", #ENGCMP-2296
+            "yara", #ENGCMP-2372
         ]
     }),
     ("^AppStream$", {

sync-from-upstream

@@ -1,9 +1,13 @@
 #!/bin/bash
+HOWMANY="-$1"
+if [ -z $1 ]; then
+  HOWMANY="-1"
+fi
 
 echo "Fetching from upstream"
 git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-9-stream
 echo "Formatting patch and applying..."
-git format-patch --stdout -1 FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply
+git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply
 echo "!! DIFF OF CHANGES !!"
 git --no-pager diff HEAD