From f638f029d3b83a93cc4de5eb408cfc1d055f2be9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 23 Dec 2020 08:08:39 +0100
Subject: only generate test repo if requested
---
mkmodular | 61 ++++++++++++-------------------------------------------------
1 file changed, 12 insertions(+), 49 deletions(-)
diff --git a/mkmodular b/mkmodular
index 201f51c..0b0668d 100755
--- a/mkmodular
+++ b/mkmodular
@@ -335,48 +335,6 @@ rename($data, "$data.$arch");
chdir($old);
}
-if (count($_SERVER['argv']) > 1 && in_array('f30', $_SERVER['argv'])) {
- $dest = 'fedora/30/modular/x86_64';
- echo "Populate $dest\n";
- cleanup($dest);
- $deps = ['platform' => 'f30'];
- $mod = genModule('fedora/30/remi/x86_64', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/30/php74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
- $mod .= genDefaults('php', 'remi-7.3', ['remi-7.3', 'remi-7.4']);
- $mod .= genModule('fedora/30/glpi93/x86_64', $dest, '*.rpm', '9.3', 'x86_64', $deps, $template_glpi);
- $mod .= genModule('fedora/30/glpi94/x86_64', $dest, '*.rpm', '9.4', 'x86_64', $deps, $template_glpi);
- $mod .= genDefaults('glpi', '9.4', ['9.3', '9.4']);
- createRepo($dest, $mod);
-
- $dest = 'fedora/30/modular-test/x86_64';
- echo "Populate $dest\n";
- cleanup($dest);
- $deps = ['platform' => 'f30'];
- $mod = genModule('fedora/30/test/x86_64', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'x86_64', $deps, $template_php);
- $mod .= genModule('fedora/30/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
- createRepo($dest, $mod);
-
- $dest = 'fedora/30/modular/i386';
- echo "Populate $dest\n";
- cleanup($dest);
- $deps = ['platform' => 'f30'];
- $mod = genModule('fedora/30/remi/i386', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'i386', $deps, $template_php);
- $mod .= genModule('fedora/30/php74/i386', $dest, '*.rpm', '7.4', 'i386', $deps, $template_php);
- $mod .= genDefaults('php', 'remi-7.3', ['remi-7.3', 'remi-7.4']);
- $mod .= genModule('fedora/30/glpi93/i386', $dest, '*.rpm', '9.3', 'i386', $deps, $template_glpi);
- $mod .= genModule('fedora/30/glpi94/i386', $dest, '*.rpm', '9.4', 'i386', $deps, $template_glpi);
- $mod .= genDefaults('glpi', '9.4', ['9.3', '9.4']);
- createRepo($dest, $mod);
-
- $dest = 'fedora/30/modular-test/i386';
- echo "Populate $dest\n";
- cleanup($dest);
- $deps = ['platform' => 'f30'];
- $mod = genModule('fedora/30/test/i386', $dest, ['unit-php*rpm', 'php-*7.3*.rpm'], '7.3', 'i386', $deps, $template_php);
- $mod .= genModule('fedora/30/test74/i386', $dest, '*.rpm', '7.4', 'i386', $deps, $template_php);
- createRepo($dest, $mod);
-}
-
if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) {
$dest = 'fedora/31/modular/x86_64';
echo "Populate $dest\n";
@@ -390,7 +348,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f31', $_SERVER['argv'])) {
$mod .= genModule('fedora/31/glpi94/x86_64', $dest, '*.rpm', '9.4', 'x86_64', $deps, $template_glpi);
$mod .= genDefaults('glpi', '9.4', ['9.3', '9.4']);
createRepo($dest, $mod);
-
+}
+if (in_array('f31', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$dest = 'fedora/31/modular-test/x86_64';
echo "Populate $dest\n";
cleanup($dest);
@@ -410,7 +369,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f32', $_SERVER['argv'])) {
$mod .= genModule('fedora/32/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
$mod .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
createRepo($dest, $mod);
-
+}
+if (in_array('f32', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$dest = 'fedora/32/modular-test/x86_64';
echo "Populate $dest\n";
cleanup($dest);
@@ -429,7 +389,8 @@ if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
$mod .= genModule('fedora/33/php80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
$mod .= genDefaults('php', 'remi-7.4', ['remi-7.4', 'remi-8.0']);
createRepo($dest, $mod);
-
+}
+if (in_array('f33', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$dest = 'fedora/33/modular-test/x86_64';
echo "Populate $dest\n";
cleanup($dest);
@@ -439,7 +400,7 @@ if (count($_SERVER['argv']) < 2 || in_array('f33', $_SERVER['argv'])) {
createRepo($dest, $mod);
}
-if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
+if (in_array('el8', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$dest = 'enterprise/8/modular-test/x86_64';
echo "Populate $dest\n";
cleanup($dest);
@@ -449,7 +410,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
$mod .= genModule('enterprise/8/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
$mod .= genModule('enterprise/8/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
createRepo($dest, $mod);
-
+}
+if (count($_SERVER['argv']) < 2 || in_array('el8', $_SERVER['argv'])) {
$dest = 'enterprise/8/modular/x86_64';
echo "Populate $dest\n";
cleanup($dest);
@@ -489,7 +451,7 @@ if (count($_SERVER['argv']) > 1 && in_array('epel', $_SERVER['argv'])) {
createRepo($dest, $mod);
}
-if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
+if (in_array('el7', $_SERVER['argv']) || in_array('test', $_SERVER['argv'])) {
$dest = 'enterprise/7/modular-test/x86_64';
echo "Populate $dest\n";
cleanup($dest);
@@ -500,7 +462,8 @@ if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
$mod .= genModule('enterprise/7/test74/x86_64', $dest, '*.rpm', '7.4', 'x86_64', $deps, $template_php);
$mod .= genModule('enterprise/7/test80/x86_64', $dest, '*.rpm', '8.0', 'x86_64', $deps, $template_php);
createRepo($dest, $mod);
-
+}
+if (count($_SERVER['argv']) < 2 || in_array('el7', $_SERVER['argv'])) {
$dest = 'enterprise/7/modular/x86_64';
echo "Populate $dest\n";
cleanup($dest);
--
cgit