From 2c7154be1734cbe3f89f1291b96471b8ab3bf800 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 25 Mar 2026 09:20:26 +0100 Subject: valkey 9.1 helpers --- buildfct | 6 ++++++ getmock | 19 +++++++++++++++++++ mkmodular | 48 ++++++++++++++++++++++++++++++++++++------------ mockit | 13 +++++++------ 4 files changed, 68 insertions(+), 18 deletions(-) diff --git a/buildfct b/buildfct index 7510819..be6d553 100644 --- a/buildfct +++ b/buildfct @@ -26,6 +26,7 @@ alias mockfc42xr84=" mock --configdir=$mocketc -r fc42xr84 alias mockfc42xr86=" mock --configdir=$mocketc -r fc42xr86 rebuild " alias mockfc42xv81=" mock --configdir=$mocketc -r fc42xv81 rebuild " alias mockfc42xv90=" mock --configdir=$mocketc -r fc42xv90 rebuild " +alias mockfc42xv91=" mock --configdir=$mocketc -r fc42xv91 rebuild " alias mockfc43x=" mock --configdir=$mocketc -r fc43x rebuild " alias mockfc43x74=" mock --configdir=$mocketc -r fc43x74 rebuild " @@ -48,6 +49,7 @@ alias mockfc43xr84=" mock --configdir=$mocketc -r fc43xr84 alias mockfc43xr86=" mock --configdir=$mocketc -r fc43xr86 rebuild " alias mockfc43xv81=" mock --configdir=$mocketc -r fc43xv81 rebuild " alias mockfc43xv90=" mock --configdir=$mocketc -r fc43xv90 rebuild " +alias mockfc43xv91=" mock --configdir=$mocketc -r fc43xv91 rebuild " alias mockfc44x=" mock --configdir=$mocketc -r fc44x rebuild " alias mockfc44x74=" mock --configdir=$mocketc -r fc44x74 rebuild " @@ -70,6 +72,7 @@ alias mockfc44xr84=" mock --configdir=$mocketc -r fc44xr84 alias mockfc44xr86=" mock --configdir=$mocketc -r fc44xr86 rebuild " alias mockfc44xv81=" mock --configdir=$mocketc -r fc44xv81 rebuild " alias mockfc44xv90=" mock --configdir=$mocketc -r fc44xv90 rebuild " +alias mockfc44xv91=" mock --configdir=$mocketc -r fc44xv91 rebuild " alias mockel8x=" mock --configdir=$mocketc -r el8x rebuild " alias mockel8xr=" mock --configdir=$mocketc -r el8xr rebuild " @@ -108,6 +111,7 @@ alias mockel8xr84=" mock --configdir=$mocketc -r el8xr84 r alias mockel8xr86=" mock --configdir=$mocketc -r el8xr86 rebuild " alias mockel8xv81=" mock --configdir=$mocketc -r el8xv81 rebuild " alias mockel8xv90=" mock --configdir=$mocketc -r el8xv90 rebuild " +alias mockel8xv91=" mock --configdir=$mocketc -r el8xv91 rebuild " ## alias mockel8xm=" mock --configdir=$mocketc -r el8xm rebuild " alias mockel9x=" mock --configdir=$mocketc -r el9x rebuild " @@ -140,6 +144,7 @@ alias mockel9xr84=" mock --configdir=$mocketc -r el9xr84 r alias mockel9xr86=" mock --configdir=$mocketc -r el9xr86 rebuild " alias mockel9xv81=" mock --configdir=$mocketc -r el9xv81 rebuild " alias mockel9xv90=" mock --configdir=$mocketc -r el9xv90 rebuild " +alias mockel9xv91=" mock --configdir=$mocketc -r el9xv91 rebuild " alias mockel9xm=" mock --configdir=$mocketc -r el9xm rebuild " alias mockel10x=" mock --configdir=$mocketc -r el10x rebuild " @@ -168,6 +173,7 @@ alias mockel10xr84=" mock --configdir=$mocketc -r el10xr84 alias mockel10xr86=" mock --configdir=$mocketc -r el10xr86 rebuild " alias mockel10xv81=" mock --configdir=$mocketc -r el10xv81 rebuild " alias mockel10xv90=" mock --configdir=$mocketc -r el10xv90 rebuild " +alias mockel10xv91=" mock --configdir=$mocketc -r el10xv91 rebuild " alias mockel10xm=" mock --configdir=$mocketc -r el10xm rebuild " alias mockel10t84=" mock --configdir=$mocketc -r el10t84 rebuild " diff --git a/getmock b/getmock index d838505..e4cf36d 100755 --- a/getmock +++ b/getmock @@ -688,6 +688,21 @@ elif [ $1 = allr72 ]; then getOneMock el10x $opt '*module_redis.7.2*' getOneMock el10a $opt '*module_redis.7.2*' +elif [ $1 = allv91 ]; then + opt=valkey91 + getOneMock fc42x $opt '*module_valkey.9.1*' + getOneMock fc42a $opt '*module_valkey.9.1*' + getOneMock fc43x $opt '*module_valkey.9.1*' + getOneMock fc43a $opt '*module_valkey.9.1*' + getOneMock fc44x $opt '*module_valkey.9.1*' + getOneMock fc44a $opt '*module_valkey.9.1*' + getOneMock el8x $opt '*module_valkey.9.1*' + getOneMock el8a $opt '*module_valkey.9.1*' + getOneMock el9x $opt '*module_valkey.9.1*' + getOneMock el9a $opt '*module_valkey.9.1*' + getOneMock el10x $opt '*module_valkey.9.1*' + getOneMock el10a $opt '*module_valkey.9.1*' + elif [ $1 = allv90 ]; then opt=valkey90 getOneMock fc42x $opt '*module_valkey.9.0*' @@ -784,6 +799,10 @@ elif [ $1 = allm ]; then getOneMock el8a $opt '*1.6*' getOneMock fc42x $opt '*1.6*' getOneMock fc42a $opt '*1.6*' + getOneMock fc43x $opt '*1.6*' + getOneMock fc43a $opt '*1.6*' + getOneMock fc44x $opt '*1.6*' + getOneMock fc44a $opt '*1.6*' opt=memcached getOneMock el9x $opt '*1.6*' getOneMock el9a $opt '*1.6*' diff --git a/mkmodular b/mkmodular index 2649038..e04c827 100755 --- a/mkmodular +++ b/mkmodular @@ -461,7 +461,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $mod .= genModule('fedora/42/valkey81/x86_64',$dest, '*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/42/valkey90/x86_64',$dest, '*.rpm', '9.0', 'x86_64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('fedora/42/valkey91/x86_64',$dest, '*.rpm', '9.1', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); createRepo($dest, $mod); $dest = 'fedora/42/debug-modular/x86_64'; @@ -483,6 +484,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $mod .= genModule('fedora/42/debug-redis86/x86_64',$dest, '*.rpm', '8.6', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/42/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/42/debug-valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genModule('fedora/42/debug-valkey91/x86_64',$dest,'*.rpm', '9.1', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); } if (in_array('f42', $_SERVER['argv']) || in_array('f42x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -541,7 +543,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $mod .= genModule('fedora/42/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/42/valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('fedora/42/valkey91/aarch64',$dest,'*.rpm', '9.1', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); createRepo($dest, $mod); $dest = 'fedora/42/debug-modular/aarch64'; @@ -563,6 +566,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f42', $_SERVER['argv']) || in_array $mod .= genModule('fedora/42/debug-redis86/aarch64',$dest, '*.rpm', '8.6', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/42/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/42/debug-valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genModule('fedora/42/debug-valkey91/aarch64',$dest,'*.rpm', '9.1', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); } if (in_array('f42', $_SERVER['argv']) || in_array('f42a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -622,7 +626,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array $mod .= genModule('fedora/43/valkey81/x86_64',$dest, '*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/43/valkey90/x86_64',$dest, '*.rpm', '9.0', 'x86_64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('fedora/43/valkey91/x86_64',$dest, '*.rpm', '9.1', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); createRepo($dest, $mod); $dest = 'fedora/43/debug-modular/x86_64'; @@ -644,6 +649,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array $mod .= genModule('fedora/43/debug-redis86/x86_64',$dest, '*.rpm', '8.6', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/43/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/43/debug-valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genModule('fedora/43/debug-valkey91/x86_64',$dest,'*.rpm', '9.1', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); } if (in_array('f43', $_SERVER['argv']) || in_array('f43x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -702,7 +708,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array $mod .= genModule('fedora/43/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/43/valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('fedora/43/valkey91/aarch64',$dest,'*.rpm', '9.1', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); createRepo($dest, $mod); $dest = 'fedora/43/debug-modular/aarch64'; @@ -724,6 +731,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f43', $_SERVER['argv']) || in_array $mod .= genModule('fedora/43/debug-redis86/aarch64',$dest, '*.rpm', '8.6', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/43/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/43/debug-valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genModule('fedora/43/debug-valkey91/aarch64',$dest,'*.rpm', '9.1', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); } if (in_array('f43', $_SERVER['argv']) || in_array('f43a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -783,7 +791,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f44', $_SERVER['argv']) || in_array $mod .= genModule('fedora/44/valkey81/x86_64',$dest, '*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/44/valkey90/x86_64',$dest, '*.rpm', '9.0', 'x86_64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('fedora/44/valkey91/x86_64',$dest, '*.rpm', '9.1', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); createRepo($dest, $mod); $dest = 'fedora/44/debug-modular/x86_64'; @@ -805,6 +814,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f44', $_SERVER['argv']) || in_array $mod .= genModule('fedora/44/debug-redis86/x86_64',$dest, '*.rpm', '8.6', 'x86_64', $deps, $template_redis); $mod .= genModule('fedora/44/debug-valkey81/x86_64',$dest,'*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('fedora/44/debug-valkey90/x86_64',$dest,'*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genModule('fedora/44/debug-valkey91/x86_64',$dest,'*.rpm', '9.1', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); } if (in_array('f44', $_SERVER['argv']) || in_array('f44x', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -863,7 +873,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f44', $_SERVER['argv']) || in_array $mod .= genModule('fedora/44/valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/44/valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('fedora/44/valkey91/aarch64',$dest,'*.rpm', '9.1', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); createRepo($dest, $mod); $dest = 'fedora/44/debug-modular/aarch64'; @@ -885,6 +896,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f44', $_SERVER['argv']) || in_array $mod .= genModule('fedora/44/debug-redis86/aarch64',$dest, '*.rpm', '8.6', 'aarch64', $deps, $template_redis); $mod .= genModule('fedora/44/debug-valkey81/aarch64',$dest,'*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('fedora/44/debug-valkey90/aarch64',$dest,'*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genModule('fedora/44/debug-valkey91/aarch64',$dest,'*.rpm', '9.1', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); } if (in_array('f44', $_SERVER['argv']) || in_array('f44a', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) { @@ -991,7 +1003,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/8/valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('enterprise/8/valkey91/x86_64',$dest, 'valke*.rpm', '9.1', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'x86_64', $deps, $template_comp); @@ -1029,6 +1042,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/debug-redis86/x86_64', $dest, 'redis*.rpm', '8.6', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/8/debug-valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/8/debug-valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genModule('enterprise/8/debug-valkey91/x86_64',$dest, 'valke*.rpm', '9.1', 'x86_64', $deps, $template_valkey); createRepo($dest, $mod); } @@ -1103,7 +1117,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/8/valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('enterprise/8/valkey91/aarch64',$dest, 'valke*.rpm', '9.1', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); $deps = ['platform' => 'el8', 'php' => '']; $mod .= genModule('enterprise/8/composer1/x86_64', $dest, '*.rpm', '1', 'aarch64', $deps, $template_comp); @@ -1140,6 +1155,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv']) || in_array $mod .= genModule('enterprise/8/debug-redis86/aarch64', $dest, 'redis*.rpm', '8.6', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/8/debug-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/8/debug-valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genModule('enterprise/8/debug-valkey91/aarch64',$dest, 'valke*.rpm', '9.1', 'aarch64', $deps, $template_valkey); createRepo($dest, $mod); } @@ -1208,7 +1224,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $mod .= genModule('enterprise/9/valkey81/x86_64', $dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/9/valkey90/x86_64', $dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('enterprise/9/valkey91/x86_64', $dest, 'valke*.rpm', '9.1', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); $mod .= genModule('enterprise/9/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1243,6 +1260,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-redis86/x86_64', $dest, 'redis*.rpm', '8.6', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/9/debug-valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genModule('enterprise/9/debug-valkey91/x86_64',$dest, 'valke*.rpm', '9.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/9/debug-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); createRepo($dest, $mod); @@ -1278,7 +1296,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv']) $mod .= genModule('enterprise/9/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/9/valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('enterprise/9/valkey91/aarch64',$dest, 'valke*.rpm', '9.1', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); $mod .= genModule('enterprise/9/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1313,6 +1332,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el9', $_SERVER['argv'])) { $mod .= genModule('enterprise/9/debug-redis86/aarch64', $dest, 'redis*.rpm', '8.6', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/9/debug-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/9/debug-valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genModule('enterprise/9/debug-valkey91/aarch64',$dest, 'valke*.rpm', '9.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/9/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); createRepo($dest, $mod); @@ -1414,7 +1434,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv']) $mod .= genModule('enterprise/10/valkey81/x86_64',$dest, 'valke*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/10/valkey90/x86_64',$dest, 'valke*.rpm', '9.0', 'x86_64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('enterprise/10/valkey91/x86_64',$dest, 'valke*.rpm', '9.1', 'x86_64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); $mod .= genModule('enterprise/10/memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1450,6 +1471,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) { $mod .= genModule('enterprise/10/debug-redis86/x86_64', $dest, 'redis*.rpm', '8.6', 'x86_64', $deps, $template_redis); $mod .= genModule('enterprise/10/debug-valkey81/x86_64',$dest, 'redis*.rpm', '8.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/10/debug-valkey90/x86_64',$dest, 'redis*.rpm', '9.0', 'x86_64', $deps, $template_valkey); + $mod .= genModule('enterprise/10/debug-valkey91/x86_64',$dest, 'redis*.rpm', '9.1', 'x86_64', $deps, $template_valkey); $mod .= genModule('enterprise/10/debug-memcached/x86_64', $dest, 'mem*.rpm', false, 'x86_64', $deps, $template_memcached); createRepo($dest, $mod); @@ -1481,7 +1503,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv']) $mod .= genModule('enterprise/10/valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/10/valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); - $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0']); + $mod .= genModule('enterprise/10/valkey91/aarch64',$dest, 'valke*.rpm', '9.1', 'aarch64', $deps, $template_valkey); + $mod .= genDefaults('valkey', false, ['remi-8.1', 'remi-9.0', 'remi-9.1']); $mod .= genModule('enterprise/10/memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); $mod .= genDefaults('memcached', false, ['remi']); @@ -1512,6 +1535,7 @@ if (count($_SERVER['argv']) < 2 || in_array('el10', $_SERVER['argv'])) { $mod .= genModule('enterprise/10/debug-redis86/aarch64', $dest, 'redis*.rpm', '8.6', 'aarch64', $deps, $template_redis); $mod .= genModule('enterprise/10/debug-valkey81/aarch64',$dest, 'valke*.rpm', '8.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/10/debug-valkey90/aarch64',$dest, 'valke*.rpm', '9.0', 'aarch64', $deps, $template_valkey); + $mod .= genModule('enterprise/10/debug-valkey91/aarch64',$dest, 'valke*.rpm', '9.1', 'aarch64', $deps, $template_valkey); $mod .= genModule('enterprise/10/debug-memcached/aarch64', $dest, 'mem*.rpm', false, 'aarch64', $deps, $template_memcached); createRepo($dest, $mod); diff --git a/mockit b/mockit index 7227d57..bf8245b 100755 --- a/mockit +++ b/mockit @@ -14,7 +14,7 @@ if [ "$2" = "" ]; then echo -e "\tMemcached: memcached" echo -e "\tLibraries: im6, im7, vips" echo -e "\tRedis: r60, r62, r70, r72, r80, r82, r84, r86" - echo -e "\tValkey: v81, v90\n" + echo -e "\tValkey: v81, v90n v91\n" exit 0 fi @@ -97,13 +97,13 @@ else fi case $DIST in - *x|*xm|*xr|*xr62|*xr72|*xr80|*xr82|*xr84|*xr86|*xv81|*xv90) + *x|*xm|*xr|*xr62|*xr72|*xr80|*xr82|*xr84|*xr86|*xv81|*xv90|*xv91) if [ $SUF != x ]; then echo "Not an x86_64 builder" exit 1 fi ;; - *a|*am|*ar|*ar62|*ar72|*ar80|*ar82|*ar84|*ar86|*av81|*av90) + *a|*am|*ar|*ar62|*ar72|*ar80|*ar82|*ar84|*ar86|*av81|*av90|*av91) if [ $SUF != a ]; then if [ $REDIS -ge 1 ]; then REMOTE=1 @@ -139,9 +139,10 @@ fi if [ $REMOTE -ge 1 ]; then LST=/tmp/srpm_aarch64_sent.list touch $LST - if ! grep -q $SRPM $LST; then + CHK=$(sha1sum $SRPM) + if ! grep -q $CHK $LST; then scp $SRPM remi@ampere:todo/ - echo $SRPM >>$LST + echo $CHK >>$LST fi mocketc=/home/remi/mock QUEUE=mocka @@ -244,7 +245,7 @@ case $DIST in echo Not supported for direct build fi ;; - v81|v90) + v81|v90|v91) if [ $REDIS -ge 1 ]; then for i in fc42x fc43x fc44x el8x el9x el10x fc42a fc43a fc44a el8a el9a el10a do -- cgit