From d6ba947b97b342b887c49495de12b846d4b44690 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Aug 2022 16:43:54 +0200 Subject: more module config --- el8x.tpl | 2 +- el8xr62.cfg | 17 +++++++++++++++++ el8xr70.cfg | 9 --------- el8xrm.cfg | 17 +++++++++++++++++ el9a.tpl | 4 ++-- el9ar62.cfg | 17 +++++++++++++++++ el9ar70.cfg | 17 +++++++++++++++++ el9x.tpl | 4 ++-- el9xr62.cfg | 17 +++++++++++++++++ el9xr70.cfg | 11 +---------- fc36xm.cfg | 13 ------------- fc36xr62.cfg | 15 +++++++++++++++ fc36xr70.cfg | 13 ------------- 13 files changed, 106 insertions(+), 50 deletions(-) create mode 100644 el8xr62.cfg create mode 100644 el8xrm.cfg create mode 100644 el9ar62.cfg create mode 100644 el9ar70.cfg create mode 100644 el9xr62.cfg create mode 100644 fc36xr62.cfg diff --git a/el8x.tpl b/el8x.tpl index bd22b9c..d5448c3 100644 --- a/el8x.tpl +++ b/el8x.tpl @@ -112,6 +112,6 @@ enabled=1 name=msprod baseurl=https://packages.microsoft.com/rhel/8/prod/ enabled=0 -includepkgs=msodbcsql17 +includepkgs=msodbcsql18 """ diff --git a/el8xr62.cfg b/el8xr62.cfg new file mode 100644 index 0000000..6a8cc04 --- /dev/null +++ b/el8xr62.cfg @@ -0,0 +1,17 @@ +import datetime; + +include('el8x.tpl') + +config_opts['root'] = 'el8x' +config_opts['resultdir'] = "/var/lib/mock/el8x" + +config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.0'] + +nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); +config_opts['macros']['%_module_build']="1" +config_opts['macros']['%_module_name']="redis" +config_opts['macros']['%_module_stream']="remi-6.2" +config_opts['macros']['%_module_version']="80600" + nn; +config_opts['macros']['%_module_context']="00000000" +config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}" + diff --git a/el8xr70.cfg b/el8xr70.cfg index a583dc5..79b1f40 100644 --- a/el8xr70.cfg +++ b/el8xr70.cfg @@ -15,12 +15,3 @@ config_opts['macros']['%_module_version']="80600" + nn; config_opts['macros']['%_module_context']="00000000" config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}" -config_opts['yum.conf'] += """ - -[result-el8x] -name=result-el8x -baseurl=file:/var/lib/mock/el8x/ -metadata_expire=15 -enabled=1 - -""" diff --git a/el8xrm.cfg b/el8xrm.cfg new file mode 100644 index 0000000..3fed53c --- /dev/null +++ b/el8xrm.cfg @@ -0,0 +1,17 @@ +import datetime; + +include('el8x.tpl') + +config_opts['root'] = 'el8x' +config_opts['resultdir'] = "/var/lib/mock/el8x" + +config_opts['module_enable'] = ['varnish:6', 'postgresql:10', 'python27:2.7', 'python36:3.6', 'virt:rhel', 'httpd:2.4', 'nginx:1.14', 'php:remi-8.1', 'redis:remi-7.0'] + +nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); +config_opts['macros']['%_module_build']="1" +config_opts['macros']['%_module_name']="memcached" +config_opts['macros']['%_module_stream']="remi" +config_opts['macros']['%_module_version']="80600" + nn; +config_opts['macros']['%_module_context']="00000000" +config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}" + diff --git a/el9a.tpl b/el9a.tpl index 56723a7..4311099 100644 --- a/el9a.tpl +++ b/el9a.tpl @@ -111,8 +111,8 @@ enabled=1 [msprod] name=msprod -baseurl=https://packages.microsoft.com/rhel/8/prod/ +baseurl=https://packages.microsoft.com/rhel/9/prod/ enabled=0 -includepkgs=msodbcsql17 +includepkgs=msodbcsql18 """ diff --git a/el9ar62.cfg b/el9ar62.cfg new file mode 100644 index 0000000..43d2019 --- /dev/null +++ b/el9ar62.cfg @@ -0,0 +1,17 @@ +import datetime; + +include('el9a.tpl') + +config_opts['root'] = 'el9a' +config_opts['resultdir'] = "/var/lib/mock/el9a" + +# config_opts['module_enable'] = ['redis:remi-6.2'] + +nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); +config_opts['macros']['%_module_build']="1" +config_opts['macros']['%_module_name']="redis" +config_opts['macros']['%_module_stream']="remi-6.2" +config_opts['macros']['%_module_version']="90000" + nn; +config_opts['macros']['%_module_context']="00000000" +config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}" + diff --git a/el9ar70.cfg b/el9ar70.cfg new file mode 100644 index 0000000..d1fe9bd --- /dev/null +++ b/el9ar70.cfg @@ -0,0 +1,17 @@ +import datetime; + +include('el9a.tpl') + +config_opts['root'] = 'el9a' +config_opts['resultdir'] = "/var/lib/mock/el9a" + +# config_opts['module_enable'] = ['redis:remi-7.0'] + +nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); +config_opts['macros']['%_module_build']="1" +config_opts['macros']['%_module_name']="redis" +config_opts['macros']['%_module_stream']="remi-7.0" +config_opts['macros']['%_module_version']="90000" + nn; +config_opts['macros']['%_module_context']="00000000" +config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}" + diff --git a/el9x.tpl b/el9x.tpl index bad16d8..707fba3 100644 --- a/el9x.tpl +++ b/el9x.tpl @@ -109,8 +109,8 @@ enabled=1 [msprod] name=msprod -baseurl=https://packages.microsoft.com/rhel/8/prod/ +baseurl=https://packages.microsoft.com/rhel/9/prod/ enabled=0 -includepkgs=msodbcsql17 +includepkgs=msodbcsql18 """ diff --git a/el9xr62.cfg b/el9xr62.cfg new file mode 100644 index 0000000..210cbd5 --- /dev/null +++ b/el9xr62.cfg @@ -0,0 +1,17 @@ +import datetime; + +include('el9x.tpl') + +config_opts['root'] = 'el9x' +config_opts['resultdir'] = "/var/lib/mock/el9x" + +# config_opts['module_enable'] = ['redis:remi-6.2'] + +nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); +config_opts['macros']['%_module_build']="1" +config_opts['macros']['%_module_name']="redis" +config_opts['macros']['%_module_stream']="remi-6.2" +config_opts['macros']['%_module_version']="90000" + nn; +config_opts['macros']['%_module_context']="00000000" +config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}" + diff --git a/el9xr70.cfg b/el9xr70.cfg index 64b6e37..c642c77 100644 --- a/el9xr70.cfg +++ b/el9xr70.cfg @@ -5,7 +5,7 @@ include('el9x.tpl') config_opts['root'] = 'el9x' config_opts['resultdir'] = "/var/lib/mock/el9x" -config_opts['module_enable'] = ['redis:remi-7.0'] +# config_opts['module_enable'] = ['redis:remi-7.0'] nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); config_opts['macros']['%_module_build']="1" @@ -15,12 +15,3 @@ config_opts['macros']['%_module_version']="90000" + nn; config_opts['macros']['%_module_context']="00000000" config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}" -config_opts['yum.conf'] += """ - -[result-el9x] -name=result-el9x -baseurl=file:/var/lib/mock/el9x/ -metadata_expire=15 -enabled=1 - -""" diff --git a/fc36xm.cfg b/fc36xm.cfg index a564f15..fa64f56 100644 --- a/fc36xm.cfg +++ b/fc36xm.cfg @@ -2,7 +2,6 @@ import datetime; include('fc36x.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache php-devel php-pear' config_opts['root'] = 'fc36x' config_opts['resultdir'] = "/var/lib/mock/fc36x" @@ -14,15 +13,3 @@ config_opts['macros']['%_module_version']="36" + nn; config_opts['macros']['%_module_context']="00000000" config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}" -config_opts['yum.conf'] += """ - -[result-fc36x] -name=result-fc36x -baseurl=file:/var/lib/mock/fc36x/ -enabled=1 -metadata_expire=1 -module_hotfixes=1 -priority=1 - -""" - diff --git a/fc36xr62.cfg b/fc36xr62.cfg new file mode 100644 index 0000000..2f437d3 --- /dev/null +++ b/fc36xr62.cfg @@ -0,0 +1,15 @@ +import datetime; + +include('fc36x.tpl') + +config_opts['root'] = 'fc36x' +config_opts['resultdir'] = "/var/lib/mock/fc36x" + +nn = datetime.datetime.now().strftime("%Y%m%d%H%M%S"); +config_opts['macros']['%_module_build']="1" +config_opts['macros']['%_module_name']="redis" +config_opts['macros']['%_module_stream']="remi-6.2" +config_opts['macros']['%_module_version']="36" + nn; +config_opts['macros']['%_module_context']="00000000" +config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}" + diff --git a/fc36xr70.cfg b/fc36xr70.cfg index d876b11..0369cbe 100644 --- a/fc36xr70.cfg +++ b/fc36xr70.cfg @@ -2,7 +2,6 @@ import datetime; include('fc36x.tpl') -config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache php-devel php-pear' config_opts['root'] = 'fc36x' config_opts['resultdir'] = "/var/lib/mock/fc36x" @@ -14,15 +13,3 @@ config_opts['macros']['%_module_version']="36" + nn; config_opts['macros']['%_module_context']="00000000" config_opts['macros']['%modularitylabel']="%{_module_name}:%{_module_stream}:%{_module_version}:%{_module_context}" -config_opts['yum.conf'] += """ - -[result-fc36x] -name=result-fc36x -baseurl=file:/var/lib/mock/fc36x/ -enabled=1 -metadata_expire=1 -module_hotfixes=1 -priority=1 - -""" - -- cgit