diff --git a/preupdates/CentOS-Base.repo b/preupdates/CentOS-Base.repo new file mode 100644 index 0000000..2f5947f --- /dev/null +++ b/preupdates/CentOS-Base.repo @@ -0,0 +1,70 @@ +# 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/centos/$releasever/os/$basearch/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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 + +#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 + +#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 + +#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 + +#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 + diff --git a/preupdates/CentOS-Base.repo.c5 b/preupdates/CentOS-Base.repo.c5 new file mode 100644 index 0000000..9baf56d --- /dev/null +++ b/preupdates/CentOS-Base.repo.c5 @@ -0,0 +1,65 @@ +# 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/centos/$releasever/os/$basearch/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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/centos/$releasever/extras/$basearch/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + diff --git a/preupdates/CentOS-Base.repo.c5.fasttrack b/preupdates/CentOS-Base.repo.c5.fasttrack new file mode 100644 index 0000000..27520b9 --- /dev/null +++ b/preupdates/CentOS-Base.repo.c5.fasttrack @@ -0,0 +1,65 @@ +# 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/centos/$releasever/os/$basearch/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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/centos/$releasever/extras/$basearch/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + diff --git a/preupdates/CentOS-Base.repo.fasttrack b/preupdates/CentOS-Base.repo.fasttrack new file mode 100644 index 0000000..f92fee6 --- /dev/null +++ b/preupdates/CentOS-Base.repo.fasttrack @@ -0,0 +1,70 @@ +# 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/centos/$releasever/os/$basearch/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + +#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 + +#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 + +#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 + +#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 + +#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=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-$releasever + diff --git a/tests/0_common/000_centos_default_repos.py b/tests/0_common/000_centos_default_repos.py index 2108599..60f76fd 100755 --- a/tests/0_common/000_centos_default_repos.py +++ b/tests/0_common/000_centos_default_repos.py @@ -9,9 +9,20 @@ import yum import sys import datetime +import os yb = yum.YumBase() -centos_default_repos = ['base','extras','updates','cr'] + +try: + fasttrack = int(os.environ['FASTTRACK']) +except KeyError: + fasttrack = 0 + +if fasttrack: + centos_default_repos = ['base','extras','updates','cr','fasttrack'] +else: + centos_default_repos = ['base','extras','updates','cr'] + now = lambda: datetime.datetime.today().strftime("%c") print "[+] %s -> Check if non default repo is enabled" % now() for repo in yb.repos.listEnabled(): diff --git a/tests/0_common/01_dist_release_check.sh b/tests/0_common/01_dist_release_check.sh old mode 100644 new mode 100755 diff --git a/tests/0_common/10_remove_32bitpkgs.sh b/tests/0_common/10_remove_32bitpkgs.sh old mode 100644 new mode 100755 diff --git a/tests/0_common/15_list_repos.sh b/tests/0_common/15_list_repos.sh new file mode 100755 index 0000000..4f568ca --- /dev/null +++ b/tests/0_common/15_list_repos.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +t_Log "Running $0 - Showing the repos we have configured" + +yum -d0 repolist -v + +t_CheckExitStatus $? diff --git a/tests/p_abrt-cli/10-abrt-cli-reporting-test.sh b/tests/p_abrt-cli/10-abrt-cli-reporting-test.sh old mode 100644 new mode 100755 diff --git a/tests/p_abrt-cli/_lib.sh b/tests/p_abrt-cli/_lib.sh old mode 100644 new mode 100755 diff --git a/tests/p_bc/bc-test-basic-functionalities.sh b/tests/p_bc/bc-test-basic-functionalities.sh old mode 100644 new mode 100755 diff --git a/tests/p_bc/bc-test-installation.sh b/tests/p_bc/bc-test-installation.sh old mode 100644 new mode 100755 diff --git a/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh b/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh index c47166a..c68993f 100755 --- a/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh +++ b/tests/p_yum-plugin-fastestmirror/10-fastestmirror.sh @@ -2,6 +2,11 @@ # Ensure plugin is enabled : +if [ "$PRE_UPDATES" == "1" ]; then + t_Log "skipping $0 for pre update testing" + exit 0 +fi + t_Log "Running $0 - is y-p-fastestmirror enabled." grep 'enabled=1' /etc/yum/pluginconf.d/fastestmirror.conf > /dev/null t_CheckExitStatus $? diff --git a/tests/z_repoclosure/repoclosure_test.sh b/tests/z_repoclosure/repoclosure_test.sh index 37fc2ef..ab637d7 100755 --- a/tests/z_repoclosure/repoclosure_test.sh +++ b/tests/z_repoclosure/repoclosure_test.sh @@ -3,7 +3,7 @@ t_Log "Running $0 - repoclosure test ." -if [ $SKIP_QA_HARNESS -eq 1 ]; then +if [ $SKIP_QA_HARNESS -eq 1 ] && [ "$PRE_UPDATES" != "1" ] ; then t_Log "Skip this test in non QA harness environment" else