'venv-salt-minion' update via Direct Workflow

Prevent conflicts due libffi in AlmaLinux 9
Merging
2025-11-25 15:34:28 +00:00 · 2025-11-21 11:13:21 +00:00 · 2025-11-19 11:24:44 +00:00 · 2025-11-19 10:34:46 +00:00 · 2025-11-18 12:07:34 +00:00 · 2025-11-18 11:47:09 +00:00
40 changed files with 73 additions and 58 deletions
--- a/45
+++ b/45
@@ -2,7 +2,7 @@
 ##################### SLE_12 ###############################
 ############################################################
 %if 0%{?suse_version} == 1315
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$

 Prefer: saltbundle-libopenssl1_0_0
 Prefer: saltbundle-libyaml
@@ -21,7 +21,7 @@ Macros:
 ##################### SLE_15 ###############################
 ############################################################
 %if 0%{?suse_version} == 1500
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$

 Prefer: saltbundle-libyaml

@@ -31,7 +31,7 @@ Prefer: saltbundle-libyaml
 ##################### SLE_16 ###############################
 ############################################################
 %if 0%{?suse_version} == 1600
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$

 FileProvides: /usr/bin/python3.11 saltbundlepy-base
 FileProvides: /usr/bin/python3 saltbundlepy-base
@@ -63,8 +63,11 @@ Substitute: netcfg setup
 Substitute: timezone tzdata
 Substitute: update-alternatives alternatives

-Prefer: saltbundle-libffi8
-Prefer: saltbundle-libffi-devel
+Ignore: ca-certificates:libffi
+Ignore: p11-kit:libffi.so.8()(64bit)
+Ignore: p11-kit:libffi.so.8(LIBFFI_BASE_8.0)(64bit)
+Ignore: p11-kit:libffi.so.8(LIBFFI_CLOSURE_8.0)(64bit)
+Prefer: libffi

 Prefer: selinux-policy-targeted

@@ -72,7 +75,7 @@ Prefer: util-linux-core

 FileProvides: /usr/bin/who coreutils

-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$

 Macros:
 %ext_man .gz
@@ -100,13 +103,17 @@ Substitute: netcfg setup
 Substitute: timezone tzdata
 Substitute: update-alternatives alternatives

-Prefer: saltbundle-libffi8
+Ignore: ca-certificates:libffi
+Ignore: p11-kit:libffi.so.8()(64bit)
+Ignore: p11-kit:libffi.so.8(LIBFFI_BASE_8.0)(64bit)
+Ignore: p11-kit:libffi.so.8(LIBFFI_CLOSURE_8.0)(64bit)
+Prefer: libffi

 Prefer: selinux-policy-targeted

 FileProvides: /usr/bin/who coreutils

-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$

 # ignore python3-distro as it causes file conflicts with saltbundlepy-distro
 Ignore: python3-distro
@@ -132,14 +139,14 @@ Prefer: saltbundle-libffi-devel

 FileProvides: /usr/bin/who coreutils

-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$
 %endif

 ############################################################
 ##################### EL7 ##################################
 ############################################################
 %if 0%{?rhel} == 7 || "%_repository" == "EL7" || "%_repository" == "CentOS_7"
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$

 Support: !ncurses-devel
 Support: !gdbm-devel
@@ -219,7 +226,7 @@ Substitute: /usr/bin/who coreutils

 FileProvides: /usr/bin/who coreutils

-PublishFilter: ^(?!venv-salt-minion).*\.deb$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.deb$

 Macros:
 %_vendor debbuild
@@ -282,7 +289,7 @@ Substitute: pkgconfig(uuid) uuid-dev
 Substitute: pkgconfig(x11) libx11-dev
 Substitute: pkgconfig(zlib) zlib1g-dev

-PublishFilter: ^saltbundle.*\.deb$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.deb$
 ######## End salt bundle

 ######## Start Lua substitutes
@@ -374,7 +381,7 @@ Substitute: pkgconfig(zlib) zlib1g-dev

 FileProvides: /usr/bin/who coreutils

-PublishFilter: ^(?!venv-salt-minion).*\.deb$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.deb$

 Release: <CI_CNT>.<B_CNT> spec:150750.<CI_CNT>.<B_CNT>.develHead

@@ -451,7 +458,7 @@ Substitute: pkgconfig(zlib) zlib1g-dev

 FileProvides: /usr/bin/who coreutils

-PublishFilter: ^(?!venv-salt-minion).*\.deb$
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.deb$

 Macros:
 %_vendor debbuild
@@ -470,18 +477,12 @@ Macros:
 ############################################################
 #FIXME: we need to properly detect SL Micro 6.0
 %if "%_repository" == "Micro_60"
-PublishFilter: ^(?!venv-salt-minion).*\.rpm$
-
-FileProvides: /usr/bin/python3.11 saltbundlepy-base
-
-Prefer: saltbundle-libffi8
-Prefer: saltbundle-libyaml
-
-FileProvides: /usr/bin/python3 saltbundlepy-base
+PublishFilter: ^(saltbundle|perl|lua|liblua|fdupes|pcre|libpcre|autoconf-archive|deb-perl|debbuild).*\.rpm$

 BuildFlags: excludebuild:spacecmd

 Ignore: cmake-mini:python3-base
+Ignore: gdb:python3-base
 %endif

 ############################################################
--- a/_maintainership.json
+++ b/_maintainership.json
@@ -0,0 +1,3 @@
+{
+  "": ["PSuarezHernandez","agraul","vizhestkov","ygutierrez","mczernek"]
+}
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/staging.config
+++ b/staging.config
@@ -0,0 +1,4 @@
+{
+  "ObsProject": "systemsmanagement:saltstack:bundle:scm:testing",
+  "StagingProject": "systemsmanagement:saltstack:bundle:scm:testing:PullRequest"
+}
--- a/2
+++ b/2
--- a/workflow.config
+++ b/workflow.config
@@ -0,0 +1,7 @@
+{
+    "Workflows": ["direct", "pr"],
+    "Organization": "saltbundle",
+    "Branch": "bundle_testing",
+    "GitProjectName": "saltbundle/_ObsPrj#bundle_testing",
+    "ManualMergeProject": true
+}
Author	SHA256	Message	Date
AutoGits prjgit-updater	27ab1fbe33	'venv-salt-minion' update via Direct Workflow	2025-11-25 15:34:28 +00:00
Pablo Suárez Hernández	9a7df68881	Prevent conflicts due libffi in AlmaLinux 9	2025-11-21 11:13:21 +00:00
AutoGits PR Review Bot	8daacebdc1	Merging PR: saltbundle/_ObsPrj!35	2025-11-19 11:24:44 +00:00
AutoGits PR Review Bot	11408c8acc	auto-created for saltbundlepy-pyasn1-modules All checks were successful ObsStaging OBS Staging build Details This commit was autocreated by AutoGits PR Review Bot referencing PRs: PR: saltbundle/saltbundlepy-pyasn1-modules!3	2025-11-19 10:34:46 +00:00
AutoGits PR Review Bot	5f70629273	Merging PR: saltbundle/_ObsPrj!29	2025-11-18 12:07:34 +00:00
AutoGits PR Review Bot	b055d55202	auto-created for saltbundlepy-websocket-client All checks were successful ObsStaging OBS Staging build Details This commit was autocreated by AutoGits PR Review Bot referencing PRs: PR: saltbundle/saltbundlepy-websocket-client!1	2025-11-18 11:47:09 +00:00
Pablo Suárez Hernández	e493e14e49	Prevent conflicts due libffi in AlmaLinux 10	2025-11-18 10:18:49 +00:00
Elisei Roca	eaf8c61707	Fix staging.config syntax	2025-11-17 16:19:50 +01:00
AutoGits prjgit-updater	1807d41e2d	Automatic update via push via Direct Workflow -- SYNC	2025-11-13 22:09:01 +00:00
AutoGits prjgit-updater	efce5ec7f8	Automatic update via push via Direct Workflow -- SYNC	2025-11-11 10:12:53 +00:00
AutoGits prjgit-updater	6ece79b332	Automatic update via push via Direct Workflow -- SYNC	2025-11-10 10:21:45 +00:00
Elisei Roca	ef63d71d46	Remove review group in favor of _maintainership.json	2025-11-06 13:18:28 +02:00
Pablo Suárez Hernández	b2a5d2515d	Update submodules for debbuild	2025-11-04 16:07:33 +00:00
Pablo Suárez Hernández	13057b4e19	Update submodule for venv-salt-minion	2025-10-30 10:32:35 +00:00
Pablo Suárez Hernández	0bfb3f144d	Update submodules	2025-10-29 12:33:38 +00:00
Pablo Suárez Hernández	75f02628c7	Do not merge PRs automatically	2025-10-28 16:07:37 +00:00
Pablo Suárez Hernández	4403a95dc9	Add reviewers configuration	2025-10-28 13:09:26 +00:00
Pablo Suárez Hernández	cec5cdb96c	Add custom StagingProject	2025-10-28 12:26:33 +00:00
Pablo Suárez Hernández	4da382fc48	Add initial staging.config	2025-10-27 16:08:33 +00:00
Pablo Suárez Hernández	0f5613f8f2	Remove trailing comma on workflow.config	2025-10-23 13:31:17 +01:00
Pablo Suárez Hernández	737bdcd6ab	Update workflow.config settings	2025-10-23 11:17:05 +01:00
Pablo Suárez Hernández	0058d5f68d	Align projconf for SLE16 and Micro_60 with Galaxy expectations	2025-10-23 11:01:47 +01:00
Pablo Suárez Hernández	38a729a282	Fix autoconf-archive in PublishFilter regex	2025-10-22 11:55:11 +01:00
Pablo Suárez Hernández	40739a9a84	Add libpcre2 to PublishFilter regex	2025-10-22 11:37:14 +01:00
Pablo Suárez Hernández	d2c86049c5	Add extra matches to PublishFilter regexs	2025-10-22 11:26:39 +01:00
Pablo Suárez Hernández	0c78d4e01e	Add extra match to PublishFilter regexs	2025-10-22 11:15:19 +01:00
Pablo Suárez Hernández	2ec71737f0	Fix PublishFilter to allow publishing non-bundle related packages	2025-10-22 11:00:11 +01:00
Pablo Suárez Hernández	c59f72351d	Update submodules	2025-10-22 10:16:28 +01:00
Pablo Suárez Hernández	dc8d04f825	Update submodules	2025-10-22 10:01:11 +01:00
Pablo Suárez Hernández	ab6292d7f6	Update submodules	2025-10-21 16:33:17 +01:00
Pablo Suárez Hernández	ae28a93b3d	Enable 'direct' and 'pr' autogits workflows	2025-10-21 15:59:53 +01:00