From 97c6960f5c84e7529f51c844d41117071c62fbbb Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Feb 13 2018 20:41:24 +0000 Subject: update to allow running on aarch64 --- diff --git a/preupdates/CentOS-Base.repo.aarch64 b/preupdates/CentOS-Base.repo.aarch64 new file mode 100644 index 0000000..35ab5e5 --- /dev/null +++ b/preupdates/CentOS-Base.repo.aarch64 @@ -0,0 +1,75 @@ +# CentOS-Base.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +[base] +name=CentOS-$releasever - Base +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os +baseurl=http://mirror.centos.org/altarch/$releasever/os/$basearch/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch + +#released updates +[updates] +name=CentOS-$releasever - Updates +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates +baseurl=http://mirror.centos.org/preupdates/centos/$releasever/updates/$basearch/ +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch + +#additional packages that may be useful +[extras] +name=CentOS-$releasever - Extras +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras +baseurl=http://mirror.centos.org/preupdates/centos/$releasever/extras/$basearch/ +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch + +#additional packages that extend functionality of existing packages +[centosplus] +name=CentOS-$releasever - Plus +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus +baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/ +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch + +#cr +[cr] +name=CentOS-$releasever - CR +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cr +baseurl=http://mirror.centos.org/preupdates/centos/$releasever/cr/$basearch/ +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch + +#fasttrack +[fasttrack] +name=CentOS-$releasever - Fasttrack +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack +baseurl=http://mirror.centos.org/preupdates/centos/$releasever/fasttrack/$basearch/ +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch diff --git a/preupdates/CentOS-Base.repo.extras.aarch64 b/preupdates/CentOS-Base.repo.extras.aarch64 new file mode 100644 index 0000000..2e0c2c1 --- /dev/null +++ b/preupdates/CentOS-Base.repo.extras.aarch64 @@ -0,0 +1,75 @@ +# CentOS-Base.repo +# +# The mirror system uses the connecting IP address of the client and the +# update status of each mirror to pick mirrors that are updated to and +# geographically close to the client. You should use this for CentOS updates +# unless you are manually picking other mirrors. +# +# If the mirrorlist= does not work for you, as a fall back you can try the +# remarked out baseurl= line instead. +# +# + +[base] +name=CentOS-$releasever - Base +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os +baseurl=http://mirror.centos.org/altarch/$releasever/os/$basearch/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch + +#released updates +[updates] +name=CentOS-$releasever - Updates +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates +baseurl=http://mirror.centos.org/preupdates/centos/$releasever/updates/$basearch/ +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch + +#additional packages that may be useful +[extras] +name=CentOS-$releasever - Extras +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras +baseurl=http://mirror.centos.org/preupdates/centos/$releasever/extras/$basearch/ +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch + +#additional packages that extend functionality of existing packages +[centosplus] +name=CentOS-$releasever - Plus +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus +baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/ +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch + +#cr +[cr] +name=CentOS-$releasever - CR +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=cr +baseurl=http://mirror.centos.org/preupdates/centos/$releasever/cr/$basearch/ +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch + +#fasttrack +[fasttrack] +name=CentOS-$releasever - Fasttrack +#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack +baseurl=http://mirror.centos.org/preupdates/centos/$releasever/fasttrack/$basearch/ +gpgcheck=1 +repo_gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7-$basearch diff --git a/tests/p_anaconda/anaconda_centos_patch.sh b/tests/p_anaconda/anaconda_centos_patch.sh index 20bfc2e..2d51845 100755 --- a/tests/p_anaconda/anaconda_centos_patch.sh +++ b/tests/p_anaconda/anaconda_centos_patch.sh @@ -3,6 +3,12 @@ t_Log "Running $0 - CentOS Anaconda patch is applied test." +uname_arch=$(uname -m) + +if [ "$uname_arch" == "aarch64" ]; then + exit 0 +fi + if [ "$centos_ver" = "7" ];then ANACONDA_PATH=/usr/lib64/python2.7/site-packages/pyanaconda/ ANACONDA_FILE="centos.py" diff --git a/tests/p_kernel/01_kernel_centos_keyring.sh b/tests/p_kernel/01_kernel_centos_keyring.sh index 533c238..277601a 100755 --- a/tests/p_kernel/01_kernel_centos_keyring.sh +++ b/tests/p_kernel/01_kernel_centos_keyring.sh @@ -4,6 +4,12 @@ t_Log "Running $0 - check CentOS' Kernel Module GPG key." +uname_arch=$(uname -m) + +if [ "$uname_arch" == "aarch64" ]; then + exit 0 +fi + if [ "$centos_ver" = "7" ] ; then for id in kpatch "Driver update" kernel do diff --git a/tests/r_check_mod_packages/01_modpackages.sh b/tests/r_check_mod_packages/01_modpackages.sh index c5af9fb..bbebc91 100755 --- a/tests/r_check_mod_packages/01_modpackages.sh +++ b/tests/r_check_mod_packages/01_modpackages.sh @@ -10,8 +10,9 @@ else if [ "$centos_ver" = "7" ] ; then t_Log "Running $0 - Checking current repositories for .el7.centos on modified files" + uname_arch=$(uname -m) yum clean all - for pkg in PackageKit abrt apache-commons-net anaconda basesystem centos-indexhtml centos-logos centos-release chrony compat-glibc dhcp firefox glusterfs grub2 httpd initial-setup ipa-client kabi-yum-plugins kde-settings libreport ntp oscap-anaconda-addon openssl098e pcs plymouth redhat-rpm-config redhat-lsb scap-security-guide shim-unsigned-ia32 shim-unsigned-x64 sos subscription-manager system-config-date system-config-kdump thunderbird xulrunner yum + for pkg in $(cat tests/r_check_mod_packages/c72-mod-packages.lst.$uname_arch) do has_centos=$(yum list $pkg | grep '.el7.centos') if [ "$has_centos" == "" ]; then diff --git a/tests/r_check_mod_packages/c72-mod-packages.lst b/tests/r_check_mod_packages/c72-mod-packages.lst deleted file mode 100644 index 122ea30..0000000 --- a/tests/r_check_mod_packages/c72-mod-packages.lst +++ /dev/null @@ -1,37 +0,0 @@ -PackageKit -abrt -apache-commons-net -anaconda -basesystem -centos-indexhtml -centos-logos -centos-release -chrony -compat-glibc -dhcp -firefox -glusterfs -grub2 -httpd -initial-setup -ipa-client -kabi-yum-plugins -kde-settings -libreport -ntp -oscap-anaconda-addon -openssl098e -pcs -plymouth -redhat-rpm-config -redhat-lsb -scap-security-guide -shim-unsigned-ia32 -shim-unsigned-x64 -sos -subscription-manager -system-config-date -system-config-kdump -thunderbird -xulrunner -yum diff --git a/tests/r_check_mod_packages/c72-mod-packages.lst.aarch64 b/tests/r_check_mod_packages/c72-mod-packages.lst.aarch64 new file mode 100644 index 0000000..0cdfc5f --- /dev/null +++ b/tests/r_check_mod_packages/c72-mod-packages.lst.aarch64 @@ -0,0 +1,27 @@ +PackageKit +abrt +apache-commons-net +basesystem +centos-indexhtml +centos-logos +centos-release +dhcp +firefox +glusterfs +grub2 +httpd +ipa-client +kabi-yum-plugins +kde-settings +libreport +ntp +oscap-anaconda-addon +pcs +scap-security-guide +sos +subscription-manager +system-config-date +system-config-kdump +thunderbird +xulrunner +yum diff --git a/tests/r_check_mod_packages/c72-mod-packages.lst.x86_64 b/tests/r_check_mod_packages/c72-mod-packages.lst.x86_64 new file mode 100644 index 0000000..122ea30 --- /dev/null +++ b/tests/r_check_mod_packages/c72-mod-packages.lst.x86_64 @@ -0,0 +1,37 @@ +PackageKit +abrt +apache-commons-net +anaconda +basesystem +centos-indexhtml +centos-logos +centos-release +chrony +compat-glibc +dhcp +firefox +glusterfs +grub2 +httpd +initial-setup +ipa-client +kabi-yum-plugins +kde-settings +libreport +ntp +oscap-anaconda-addon +openssl098e +pcs +plymouth +redhat-rpm-config +redhat-lsb +scap-security-guide +shim-unsigned-ia32 +shim-unsigned-x64 +sos +subscription-manager +system-config-date +system-config-kdump +thunderbird +xulrunner +yum diff --git a/tests/z_rpminfo/special_overrides.txt b/tests/z_rpminfo/special_overrides.txt index eba5fbd..83b37b0 100644 --- a/tests/z_rpminfo/special_overrides.txt +++ b/tests/z_rpminfo/special_overrides.txt @@ -458,3 +458,6 @@ xmlgraphics-commons-1.3.1-1.2.el6: packager xmlgraphics-commons-1.3.1-1.2.el6: vendor xmlgraphics-commons-javadoc-1.3.1-1.2.el6: packager xmlgraphics-commons-javadoc-1.3.1-1.2.el6: vendor +nss_wrapper-1.1.3-1.el7: packager +nss_wrapper-1.1.3-1.el7: vendor +redhat-access-insights-1.0.13-2.el7: vendor