add forcearch to drive the point home

This commit is contained in:
Louis Abel 2022-06-08 20:09:07 -07:00
parent 62256a72b5
commit 8a60806803
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
6 changed files with 52 additions and 36 deletions

View File

@ -3,7 +3,39 @@ sig-core-toolkit
Release Engineering toolkit for repeatable operations or functionality testing. 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 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 future. From a SIG/Core standpoint, we believe a good chunk of this should stay
[Rocky Linux](https://git.rockylinux.org) are allowed - Changes in the github here as it makes it easier for us to maintain and manage.
repository will not be synced.

View File

@ -4,7 +4,7 @@ r_log "kernel" "Testing the kernel keyring (GPG)"
ARCH=$(uname -m) ARCH=$(uname -m)
#KERNEL=$(uname -r | cut -d'-' -f1) #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" r_log "kernel" "Architecture not tested: $ARCH"
exit 0 exit 0
fi fi

View File

@ -4,7 +4,7 @@ r_log "release" "Ensure the release is actually where it should be"
case $RELEASE_NAME in case $RELEASE_NAME in
rocky) rocky)
r_log "rocky release" "Base Repo Check" 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_checkExitStatus $?
r_log "rocky release" "Check /etc/rocky-release" r_log "rocky release" "Check /etc/rocky-release"
grep -q "Rocky" /etc/rocky-release grep -q "Rocky" /etc/rocky-release

View File

@ -1,6 +1,11 @@
#!/bin/bash #!/bin/bash
r_log "rocky" "Check the GPG keys" r_log "rocky" "Check the GPG keys"
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-rockyofficial > /dev/null 2>&1 && \
file /etc/pki/rpm-gpg/RPM-GPG-KEY-rockytesting > /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 $? r_checkExitStatus $?

View File

@ -1,25 +1 @@
# Place packages that were modified for debranding, regardless if their # Packages that have been debranded will be in the rocky/metadata git repository
# 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

View File

@ -60,12 +60,15 @@
- dvd1 - dvd1
- minimal - minimal
- boot - boot
repos:
- 'BaseOS'
- 'AppStream'
repoclosure_map: repoclosure_map:
arches: arches:
x86_64: '--arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch' x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
aarch64: '--arch=aarch64 --arch=noarch' aarch64: '--forcearch=aarch64 --arch=aarch64 --arch=noarch'
ppc64le: '--arch=ppc64le --arch=noarch' ppc64le: '--forcearch=ppc64le --arch=ppc64le --arch=noarch'
s390x: '--arch=s390x --arch=noarch' s390x: '--forcearch=s390x --arch=s390x --arch=noarch'
repos: repos:
nplb: [] nplb: []
BaseOS: [] BaseOS: []