From 8a608068034982fd0d75178ff8cd2decc6ea7bfc Mon Sep 17 00:00:00 2001 From: nazunalika Date: Wed, 8 Jun 2022 20:09:07 -0700 Subject: [PATCH] add forcearch to drive the point home --- README.md | 38 +++++++++++++++++-- .../core/pkg_kernel/10-test-kernel-keyring.sh | 2 +- func/core/pkg_release/10-name-sanity-check.sh | 2 +- func/core/pkg_release/20-check-gpg-keys.sh | 9 ++++- func/debrand.list | 26 +------------ iso/py/configs/el9.yaml | 11 ++++-- 6 files changed, 52 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 7e929a7..9495108 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,39 @@ sig-core-toolkit Release Engineering toolkit for repeatable operations or functionality testing. +Currently mirrored at our [github](https://github.com/rocky-linux), +[Rocky Linux Git Service](https://git.rockylinux.org), and the +[RESF Git Service](https://git.resf.org). Changes either occur at the Rocky +Linux Git Service or RESF Git Service. + +What does this have? +-------------------- + +* analyze -> Analysis utilities (such as download stats) +* chat -> mattermost related utilities +* func -> (mostly defunct) testing scripts and tools to test base functionality +* iso -> ISO related utilities +* live -> Live image related utilities +* mangle -> Manglers and other misc stuff +* sync -> Sync tools, primarily for Rocky Linux 8 + +How can I help? +--------------- + +Fork this repository and open a PR with your changes. Keep these things in mind +when you make changes: + +* Have pre-commit installed +* Have shellcheck installed +* Shell Scripts: These must pass a shellcheck test! +* Python scripts: Try your best to follow PEP8 guidelines + +Your PR should be against the devel branch at all times. PR's against the main +branch will be closed. + +Will some of this be moved into separate repositories? +------------------------------------------------------ + There may be some things that will be moved to its own repository in the near -future. This repository may be mirrored to github. Currently changes in the -[Rocky Linux](https://git.rockylinux.org) are allowed - Changes in the github -repository will not be synced. +future. From a SIG/Core standpoint, we believe a good chunk of this should stay +here as it makes it easier for us to maintain and manage. diff --git a/func/core/pkg_kernel/10-test-kernel-keyring.sh b/func/core/pkg_kernel/10-test-kernel-keyring.sh index c1e4ff3..9c71043 100644 --- a/func/core/pkg_kernel/10-test-kernel-keyring.sh +++ b/func/core/pkg_kernel/10-test-kernel-keyring.sh @@ -4,7 +4,7 @@ r_log "kernel" "Testing the kernel keyring (GPG)" ARCH=$(uname -m) #KERNEL=$(uname -r | cut -d'-' -f1) -if [ "${ARCH}" == "aarch64" ]; then +if [ "${ARCH}" == "aarch64" ] || [ "${ARCH}" == "ppc64le" ] || [ "${ARCH}" == "s390x" ]; then r_log "kernel" "Architecture not tested: $ARCH" exit 0 fi diff --git a/func/core/pkg_release/10-name-sanity-check.sh b/func/core/pkg_release/10-name-sanity-check.sh index 4a88af5..da590da 100755 --- a/func/core/pkg_release/10-name-sanity-check.sh +++ b/func/core/pkg_release/10-name-sanity-check.sh @@ -4,7 +4,7 @@ r_log "release" "Ensure the release is actually where it should be" case $RELEASE_NAME in rocky) r_log "rocky release" "Base Repo Check" - grep -q 'name=Rocky' /etc/yum.repos.d/Rocky*-Base*.repo + grep -q 'name=Rocky' /etc/yum.repos.d/*ocky*.repo r_checkExitStatus $? r_log "rocky release" "Check /etc/rocky-release" grep -q "Rocky" /etc/rocky-release diff --git a/func/core/pkg_release/20-check-gpg-keys.sh b/func/core/pkg_release/20-check-gpg-keys.sh index e8ea65c..d99b178 100755 --- a/func/core/pkg_release/20-check-gpg-keys.sh +++ b/func/core/pkg_release/20-check-gpg-keys.sh @@ -1,6 +1,11 @@ #!/bin/bash r_log "rocky" "Check the GPG keys" -file /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial > /dev/null 2>&1 && \ - file /etc/pki/rpm-gpg/RPM-GPG-KEY-rockytesting > /dev/null 2>&1 +if [ "$RL_VER" -eq 8 ]; then + file /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial > /dev/null 2>&1 && \ + file /etc/pki/rpm-gpg/RPM-GPG-KEY-rockytesting > /dev/null 2>&1 +else + file "/etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-${RL_VER}" > /ev/null 2>&1 && \ + file "/etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-${RL_VER}-Testing" > /ev/null 2>&1 +fi r_checkExitStatus $? diff --git a/func/debrand.list b/func/debrand.list index 12b4af3..a851fae 100644 --- a/func/debrand.list +++ b/func/debrand.list @@ -1,25 +1 @@ -# Place packages that were modified for debranding, regardless if their -# release tag was modified. -# -# The format is this: -# -> Rocky Version ($RL_VER, so major version) -# -> Package Name -# X|name -ALL|abrt -ALL|anaconda -8|cloud-init -8|cockpit -ALL|dhcp -ALL|firefox -ALL|fwupdate -ALL|httpd -ALL|initial-setup -ALL|kernel -ALL|libreport -ALL|nginx -ALL|PackageKit -ALL|redhat-rpm-config -ALL|shim -ALL|sos -ALL|subscription-manager -ALL|thunderbird +# Packages that have been debranded will be in the rocky/metadata git repository diff --git a/iso/py/configs/el9.yaml b/iso/py/configs/el9.yaml index 2acb78d..d6553a8 100644 --- a/iso/py/configs/el9.yaml +++ b/iso/py/configs/el9.yaml @@ -60,12 +60,15 @@ - dvd1 - minimal - boot + repos: + - 'BaseOS' + - 'AppStream' repoclosure_map: arches: - x86_64: '--arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch' - aarch64: '--arch=aarch64 --arch=noarch' - ppc64le: '--arch=ppc64le --arch=noarch' - s390x: '--arch=s390x --arch=noarch' + x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch' + aarch64: '--forcearch=aarch64 --arch=aarch64 --arch=noarch' + ppc64le: '--forcearch=ppc64le --arch=ppc64le --arch=noarch' + s390x: '--forcearch=s390x --arch=s390x --arch=noarch' repos: nplb: [] BaseOS: []