From d695aad455404fbb43d313191725ffa776119b1b Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Mon, 15 Apr 2024 09:19:10 -0700 Subject: [PATCH] Ensure lookahead and koji configs exist --- deploy.sh | 1 + etc/mock/rl-10-lookahead-aarch64.cfg | 2 +- etc/mock/rl-10-lookahead-ppc64le.cfg | 2 +- etc/mock/rl-10-lookahead-s390x.cfg | 2 +- etc/mock/rl-10-lookahead-x86_64.cfg | 2 +- etc/mock/rl-8-koji-aarch64.cfg | 26 ++++++++++++++++ etc/mock/rl-8-koji-i686.cfg | 26 ++++++++++++++++ etc/mock/rl-8-koji-x86_64.cfg | 26 ++++++++++++++++ .../templates/rl-10-lookahead-peridot.tpl | 30 +++++++++++++++++++ etc/mock/templates/rl-10-peridot.tpl | 0 etc/mock/templates/rl-8-devel-only.tpl | 29 ++++++++++++++++++ etc/mock/templates/rl-8-koji-lookahead.tpl | 28 +++++++++++++++++ etc/mock/templates/rl-8-koji.tpl | 28 +++++++++++++++++ 13 files changed, 198 insertions(+), 4 deletions(-) create mode 100644 etc/mock/rl-8-koji-aarch64.cfg create mode 100644 etc/mock/rl-8-koji-i686.cfg create mode 100644 etc/mock/rl-8-koji-x86_64.cfg create mode 100644 etc/mock/templates/rl-10-lookahead-peridot.tpl delete mode 100644 etc/mock/templates/rl-10-peridot.tpl create mode 100644 etc/mock/templates/rl-8-koji-lookahead.tpl diff --git a/deploy.sh b/deploy.sh index 286da90..2e46784 100644 --- a/deploy.sh +++ b/deploy.sh @@ -27,6 +27,7 @@ done for arch in "${GREEN_OBSIDIAN_ARCH[@]}"; do cp etc/mock/rl-8-$arch.cfg ${MOCK_DIR} + cp etc/mock/rl-8-koji-$arch.cfg ${MOCK_DIR} done # blue onyx diff --git a/etc/mock/rl-10-lookahead-aarch64.cfg b/etc/mock/rl-10-lookahead-aarch64.cfg index 2e1aa4e..160ae3b 100644 --- a/etc/mock/rl-10-lookahead-aarch64.cfg +++ b/etc/mock/rl-10-lookahead-aarch64.cfg @@ -1,4 +1,4 @@ -include('templates/rl-10-peridot.tpl') +include('templates/rl-10-lookahead-peridot.tpl') include('templates/rl-10-scopes.tpl') config_opts['root'] = 'rl-10-lookahead-aarch64' diff --git a/etc/mock/rl-10-lookahead-ppc64le.cfg b/etc/mock/rl-10-lookahead-ppc64le.cfg index 6b38726..d876d1b 100644 --- a/etc/mock/rl-10-lookahead-ppc64le.cfg +++ b/etc/mock/rl-10-lookahead-ppc64le.cfg @@ -1,4 +1,4 @@ -include('templates/rl-10-peridot.tpl') +include('templates/rl-10-lookahead-peridot.tpl') include('templates/rl-10-scopes.tpl') config_opts['root'] = 'rl-10-lookahead-ppc64le' diff --git a/etc/mock/rl-10-lookahead-s390x.cfg b/etc/mock/rl-10-lookahead-s390x.cfg index 6d8e555..db4ac34 100644 --- a/etc/mock/rl-10-lookahead-s390x.cfg +++ b/etc/mock/rl-10-lookahead-s390x.cfg @@ -1,4 +1,4 @@ -include('templates/rl-10-peridot.tpl') +include('templates/rl-10-lookahead-peridot.tpl') include('templates/rl-10-scopes.tpl') config_opts['root'] = 'rl-10-lookahead-s390x' diff --git a/etc/mock/rl-10-lookahead-x86_64.cfg b/etc/mock/rl-10-lookahead-x86_64.cfg index 7e9629c..6984cee 100644 --- a/etc/mock/rl-10-lookahead-x86_64.cfg +++ b/etc/mock/rl-10-lookahead-x86_64.cfg @@ -1,4 +1,4 @@ -include('templates/rl-10-peridot.tpl') +include('templates/rl-10-lookahead-peridot.tpl') include('templates/rl-10-scopes.tpl') config_opts['root'] = 'rl-10-lookahead-x86_64' diff --git a/etc/mock/rl-8-koji-aarch64.cfg b/etc/mock/rl-8-koji-aarch64.cfg new file mode 100644 index 0000000..2d3d6b3 --- /dev/null +++ b/etc/mock/rl-8-koji-aarch64.cfg @@ -0,0 +1,26 @@ +include('templates/rl-8-koji.tpl') +include('templates/rl-8-scopes.tpl') + +config_opts['root'] = 'rl-8-aarch64' +config_opts['target_arch'] = 'aarch64' +config_opts['legal_host_arches'] = ('aarch64',) +config_opts['releasever'] = '8' +config_opts['description'] = 'Rocky Linux 8' +config_opts['use_bootstrap_image'] = False +config_opts['rpmbuild_command'] = '/usr/bin/rpmbuild' +config_opts['package_manager'] = 'dnf' +config_opts['dist'] = 'el8' + +# Applicable Macros +config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' +config_opts['macros']['%_host'] = 'aarch64-redhat-linux-gnu' +config_opts['macros']['%_host_cpu'] = 'aarch64' +config_opts['macros']['%_vendor'] = "redhat" +config_opts['macros']['%_vendor_host'] = "redhat" +# These are typically set from rocky-release and may not have an effect +config_opts['macros']['%__bootstrap'] = '~bootstrap' +config_opts['macros']['%distribution'] = 'Rocky Linux 8' +config_opts['macros']['%dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el8%{?with_bootstrap:~bootstrap}' +config_opts['macros']['%rhel'] = '8' + +# To set specialty macros, such as %vendor, please run 'rocky-mock-macros-setup' diff --git a/etc/mock/rl-8-koji-i686.cfg b/etc/mock/rl-8-koji-i686.cfg new file mode 100644 index 0000000..3b5d737 --- /dev/null +++ b/etc/mock/rl-8-koji-i686.cfg @@ -0,0 +1,26 @@ +include('templates/rl-8-koji.tpl') +include('templates/rl-8-scopes.tpl') + +config_opts['root'] = 'rl-8-i686' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i686',) +config_opts['releasever'] = '8' +config_opts['description'] = 'Rocky Linux 8' +config_opts['use_bootstrap_image'] = False +config_opts['rpmbuild_command'] = '/usr/bin/rpmbuild' +config_opts['package_manager'] = 'dnf' +config_opts['dist'] = 'el8' + +# Applicable Macros +config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' +config_opts['macros']['%_host'] = 'i686-redhat-linux-gnu' +config_opts['macros']['%_host_cpu'] = 'i686' +config_opts['macros']['%_vendor'] = "redhat" +config_opts['macros']['%_vendor_host'] = "redhat" +# These are typically set from rocky-release and may not have an effect +config_opts['macros']['%__bootstrap'] = '~bootstrap' +config_opts['macros']['%distribution'] = 'Rocky Linux 8' +config_opts['macros']['%dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el8%{?with_bootstrap:~bootstrap}' +config_opts['macros']['%rhel'] = '8' + +# To set specialty macros, such as %vendor, please run 'rocky-mock-macros-setup' diff --git a/etc/mock/rl-8-koji-x86_64.cfg b/etc/mock/rl-8-koji-x86_64.cfg new file mode 100644 index 0000000..40a001a --- /dev/null +++ b/etc/mock/rl-8-koji-x86_64.cfg @@ -0,0 +1,26 @@ +include('templates/rl-8-koji.tpl') +include('templates/rl-8-scopes.tpl') + +config_opts['root'] = 'rl-8-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['releasever'] = '8' +config_opts['description'] = 'Rocky Linux 8' +config_opts['use_bootstrap_image'] = False +config_opts['rpmbuild_command'] = '/usr/bin/rpmbuild' +config_opts['package_manager'] = 'dnf' +config_opts['dist'] = 'el8' + +# Applicable Macros +config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' +config_opts['macros']['%_host'] = 'x86_64-redhat-linux-gnu' +config_opts['macros']['%_host_cpu'] = 'x86_64' +config_opts['macros']['%_vendor'] = "redhat" +config_opts['macros']['%_vendor_host'] = "redhat" +# These are typically set from rocky-release and may not have an effect +config_opts['macros']['%__bootstrap'] = '~bootstrap' +config_opts['macros']['%distribution'] = 'Rocky Linux 8' +config_opts['macros']['%dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el8%{?with_bootstrap:~bootstrap}' +config_opts['macros']['%rhel'] = '8' + +# To set specialty macros, such as %vendor, please run 'rocky-mock-macros-setup' diff --git a/etc/mock/templates/rl-10-lookahead-peridot.tpl b/etc/mock/templates/rl-10-lookahead-peridot.tpl new file mode 100644 index 0000000..c3863c0 --- /dev/null +++ b/etc/mock/templates/rl-10-lookahead-peridot.tpl @@ -0,0 +1,30 @@ + +config_opts['dnf.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +metadata_expire=0 +mdpolicy=group:primary +best=1 +install_weak_deps=0 +protected_packages= +module_platform_id=platform:el10 +user_agent={{ user_agent }} + +[all] +name=all +baseurl=https://yumrepofs.build.resf.org/v1/projects/e7b83c0a-b514-4903-b739-6943bbb307f7/repo/all/$basearch +enabled=1 +gpgcheck=True +repo_gpgcheck=True +gpgkey=https://git.rockylinux.org/staging/src/rocky-release/-/raw/r10/SOURCES/RPM-GPG-KEY-Rocky-10 + +""" diff --git a/etc/mock/templates/rl-10-peridot.tpl b/etc/mock/templates/rl-10-peridot.tpl deleted file mode 100644 index e69de29..0000000 diff --git a/etc/mock/templates/rl-8-devel-only.tpl b/etc/mock/templates/rl-8-devel-only.tpl index e69de29..f0d8959 100644 --- a/etc/mock/templates/rl-8-devel-only.tpl +++ b/etc/mock/templates/rl-8-devel-only.tpl @@ -0,0 +1,29 @@ + +config_opts['dnf.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +metadata_expire=0 +mdpolicy=group:primary +best=1 +install_weak_deps=0 +protected_packages= +module_platform_id=platform:el8 +user_agent={{ user_agent }} + +[devel] +name=Rocky Linux $releasever - Devel (WARNING: UNSUPPORTED - FOR BUILDROOT USE ONLY!) +baseurl=http://dl.rockylinux.org/vault/rocky/$releasever/Devel/$basearch/os/ +gpgcheck=1 +enabled=1 +gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-8 + +""" diff --git a/etc/mock/templates/rl-8-koji-lookahead.tpl b/etc/mock/templates/rl-8-koji-lookahead.tpl new file mode 100644 index 0000000..94c8fe8 --- /dev/null +++ b/etc/mock/templates/rl-8-koji-lookahead.tpl @@ -0,0 +1,28 @@ + +config_opts['dnf.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +metadata_expire=0 +mdpolicy=group:primary +best=1 +install_weak_deps=0 +protected_packages= +module_platform_id=platform:el8 +user_agent={{ user_agent }} + +[koji] +name=Rocky Linux $releasever - Koji LookAhead Repo +baseurl=https://kojidev.rockylinux.org/kojifiles/repos/dist-rocky8-lookahead-build/latest/$basearch +gpgcheck=0 +enabled=1 + +""" diff --git a/etc/mock/templates/rl-8-koji.tpl b/etc/mock/templates/rl-8-koji.tpl index e69de29..1fc53a0 100644 --- a/etc/mock/templates/rl-8-koji.tpl +++ b/etc/mock/templates/rl-8-koji.tpl @@ -0,0 +1,28 @@ + +config_opts['dnf.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +metadata_expire=0 +mdpolicy=group:primary +best=1 +install_weak_deps=0 +protected_packages= +module_platform_id=platform:el8 +user_agent={{ user_agent }} + +[koji] +name=Rocky Linux $releasever - Koji Repo +baseurl=https://kojidev.rockylinux.org/kojifiles/repos/dist-rocky8-build/latest/$basearch +gpgcheck=0 +enabled=1 + +"""