From d39e9fffeeae50e754f61d58763add36c0423181 Mon Sep 17 00:00:00 2001 From: soksanichenko Date: Wed, 1 Mar 2023 13:26:46 +0200 Subject: [PATCH 1/2] - Use only one branch for all packages and one config --- modified_packages.yml | 86 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/modified_packages.yml b/modified_packages.yml index 2fec2f3..a14b0d4 100644 --- a/modified_packages.yml +++ b/modified_packages.yml @@ -1,5 +1,5 @@ --- -modified_packages: +main: - abrt - anaconda - anaconda-user-help @@ -50,4 +50,88 @@ modified_packages: - subscription-manager - thunderbird - virt-manager +a9: + - anaconda-user-help + - cloud-init + - crash + - dnf + - eth-tools + - firefox + - fwupd + - gcc + - gnome-settings-daemon + - grub2 + - gstreamer1-plugins-bad-free + - hplip + - initial-setup + - kernel + - kernel-rt + - libdnf + - libguestfs + - libreoffice + - libreport + - nginx + - opa-ff + - opa-fm + - openscap + - osbuild + - osbuild-composer + - redhat-rpm-config + - scap-security-guide + - shim + - shim-unsigned-aarch64 + - shim-unsigned-x64 + - sos + - subscription-manager + - thunderbird + - virt-manager + - anaconda +a8: + - anaconda + - anaconda-user-help + - bluez + - cloud-init + - clufter + - crash + - dnf + - eth-tools + - firefox + - fwupd + - fwupdate + - gcc + - gnome-settings-daemon + - golang-github-cpuguy83-go-md2man + - grub2 + - hplip + - initial-setup + - kernel + - kernel-rt + - libdnf + - libguestfs + - libreoffice + - libreport + - mongo-tools + - nginx + - opa-ff + - opa-fm + - openscap + - osbuild + - osbuild-composer + - pcs + - perl-AnyEvent + - python-nss + - python2 + - python3 + - redhat-rpm-config + - rpm-ostree + - s390utils + - scap-security-guide + - shim + - shim-unsigned-aarch64 + - shim-unsigned-x64 + - sos + - subscription-manager + - thunderbird + - virt-manager + - abrt ... From 49182b71800f0258f269c2e861c6c46de842c77d Mon Sep 17 00:00:00 2001 From: soksanichenko Date: Wed, 1 Mar 2023 13:42:06 +0200 Subject: [PATCH 2/2] - Use only one branch for all configs and a config per each branch --- a8.yml | 50 +++++++++++++++ a9.yml | 38 ++++++++++++ main.yml | 53 ++++++++++++++++ modified_packages.yml | 137 ------------------------------------------ 4 files changed, 141 insertions(+), 137 deletions(-) create mode 100644 a8.yml create mode 100644 a9.yml create mode 100644 main.yml delete mode 100644 modified_packages.yml diff --git a/a8.yml b/a8.yml new file mode 100644 index 0000000..780b45c --- /dev/null +++ b/a8.yml @@ -0,0 +1,50 @@ +--- +modified_packages: + - anaconda + - anaconda-user-help + - bluez + - cloud-init + - clufter + - crash + - dnf + - eth-tools + - firefox + - fwupd + - fwupdate + - gcc + - gnome-settings-daemon + - golang-github-cpuguy83-go-md2man + - grub2 + - hplip + - initial-setup + - kernel + - kernel-rt + - libdnf + - libguestfs + - libreoffice + - libreport + - mongo-tools + - nginx + - opa-ff + - opa-fm + - openscap + - osbuild + - osbuild-composer + - pcs + - perl-AnyEvent + - python-nss + - python2 + - python3 + - redhat-rpm-config + - rpm-ostree + - s390utils + - scap-security-guide + - shim + - shim-unsigned-aarch64 + - shim-unsigned-x64 + - sos + - subscription-manager + - thunderbird + - virt-manager + - abrt +... diff --git a/a9.yml b/a9.yml new file mode 100644 index 0000000..ed398c3 --- /dev/null +++ b/a9.yml @@ -0,0 +1,38 @@ +--- +modified_packages: + - anaconda-user-help + - cloud-init + - crash + - dnf + - eth-tools + - firefox + - fwupd + - gcc + - gnome-settings-daemon + - grub2 + - gstreamer1-plugins-bad-free + - hplip + - initial-setup + - kernel + - kernel-rt + - libdnf + - libguestfs + - libreoffice + - libreport + - nginx + - opa-ff + - opa-fm + - openscap + - osbuild + - osbuild-composer + - redhat-rpm-config + - scap-security-guide + - shim + - shim-unsigned-aarch64 + - shim-unsigned-x64 + - sos + - subscription-manager + - thunderbird + - virt-manager + - anaconda +... diff --git a/main.yml b/main.yml new file mode 100644 index 0000000..2fec2f3 --- /dev/null +++ b/main.yml @@ -0,0 +1,53 @@ +--- +modified_packages: + - abrt + - anaconda + - anaconda-user-help + - bluez + - cloud-init + - clufter + - crash + - dnf + - eth-tools + - firefox + - fwupd + - fwupdate + - gcc + - gnome-settings-daemon + - golang-github-cpuguy83-go-md2man + - grub2 + - gstreamer1-plugins-bad-free + - hplip + - initial-setup + - kernel + - kernel-rt + - libassuan + - libdnf + - libguestfs + - libreoffice + - libreport + - mongo-tools + - nginx + - opa-ff + - opa-fm + - openscap + - osbuild + - osbuild-composer + - osslsigncode + - pcs + - perl-AnyEvent + - python-nss + - python2 + - python3 + - redhat-rpm-config + - rpm-ostree + - s390utils + - scap-security-guide + - shim + - shim-unsigned-aarch64 + - shim-unsigned-x64 + - sos + - subscription-manager + - thunderbird + - virt-manager +... diff --git a/modified_packages.yml b/modified_packages.yml deleted file mode 100644 index a14b0d4..0000000 --- a/modified_packages.yml +++ /dev/null @@ -1,137 +0,0 @@ ---- -main: - - abrt - - anaconda - - anaconda-user-help - - bluez - - cloud-init - - clufter - - crash - - dnf - - eth-tools - - firefox - - fwupd - - fwupdate - - gcc - - gnome-settings-daemon - - golang-github-cpuguy83-go-md2man - - grub2 - - gstreamer1-plugins-bad-free - - hplip - - initial-setup - - kernel - - kernel-rt - - libassuan - - libdnf - - libguestfs - - libreoffice - - libreport - - mongo-tools - - nginx - - opa-ff - - opa-fm - - openscap - - osbuild - - osbuild-composer - - osslsigncode - - pcs - - perl-AnyEvent - - python-nss - - python2 - - python3 - - redhat-rpm-config - - rpm-ostree - - s390utils - - scap-security-guide - - shim - - shim-unsigned-aarch64 - - shim-unsigned-x64 - - sos - - subscription-manager - - thunderbird - - virt-manager -a9: - - anaconda-user-help - - cloud-init - - crash - - dnf - - eth-tools - - firefox - - fwupd - - gcc - - gnome-settings-daemon - - grub2 - - gstreamer1-plugins-bad-free - - hplip - - initial-setup - - kernel - - kernel-rt - - libdnf - - libguestfs - - libreoffice - - libreport - - nginx - - opa-ff - - opa-fm - - openscap - - osbuild - - osbuild-composer - - redhat-rpm-config - - scap-security-guide - - shim - - shim-unsigned-aarch64 - - shim-unsigned-x64 - - sos - - subscription-manager - - thunderbird - - virt-manager - - anaconda -a8: - - anaconda - - anaconda-user-help - - bluez - - cloud-init - - clufter - - crash - - dnf - - eth-tools - - firefox - - fwupd - - fwupdate - - gcc - - gnome-settings-daemon - - golang-github-cpuguy83-go-md2man - - grub2 - - hplip - - initial-setup - - kernel - - kernel-rt - - libdnf - - libguestfs - - libreoffice - - libreport - - mongo-tools - - nginx - - opa-ff - - opa-fm - - openscap - - osbuild - - osbuild-composer - - pcs - - perl-AnyEvent - - python-nss - - python2 - - python3 - - redhat-rpm-config - - rpm-ostree - - s390utils - - scap-security-guide - - shim - - shim-unsigned-aarch64 - - shim-unsigned-x64 - - sos - - subscription-manager - - thunderbird - - virt-manager - - abrt -...