Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use DNF instead of YUM. #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 1minutetip/run1minutetip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ cat >${test_dir}/runtest.sh <<EOF
set -x
echo PASS >/tmp/1minutetip.result

yum -y install koji createrepo wget vim
dnf -y install koji createrepo wget vim

pushd db-ci-tests
tar xfz db-ci-tests.tar.gz
Expand Down
8 changes: 4 additions & 4 deletions common/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ get_all_packages_in_repo() {
fi
}

# generate a yum repo file for downloaded data and write it to stdout
# generate a dnf repo file for downloaded data and write it to stdout
# accepts these possitional arguments:
# * package name
# * el_version (24, 25, ...), optional
Expand All @@ -48,7 +48,7 @@ generate_repo() {
el_version="${2-`os_major_version`}"
repo_name=$(get_repo_name "${el_version}" "${repotype}")
if [ "$repotype" == "mirror" ] ; then
yum -y install fedora-repos-${el_version}
dnf -y install fedora-repos-${el_version}
else
repofile=/etc/yum.repos.d/${REPOFILE-db-ci.repo}
repodir=/var/tmp/db-ci-test-repo
Expand All @@ -69,7 +69,7 @@ gpgcheck=0
enabled=1

EOM
yum clean all --disablerepo=\* --enablerepo=${repo_name}
dnf clean all --disablerepo=\* --enablerepo=${repo_name}
fi
}

Expand All @@ -85,7 +85,7 @@ exit_fail() {

# install basic tools that are usually needed for building other SW
install_build_tools() {
yum -y install \
dnf -y install \
bash bzip2 coreutils cpio diffutils findutils gawk gcc gcc-c++ grep \
gzip info make patch redhat-rpm-config rpm-build sed shadow-utils \
tar unzip util-linux-ng wget which iso-codes
Expand Down
2 changes: 1 addition & 1 deletion packages/common-scripts/install-all-pkgs/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ source ${THISDIR}/../../../common/functions.sh
source ${THISDIR}/../include.sh

set -e
yum -y install `get_all_packages_in_repo "${PACKAGE}"`
dnf -y install `get_all_packages_in_repo "${PACKAGE}"`

4 changes: 2 additions & 2 deletions packages/common-scripts/install/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source ${THISDIR}/../include.sh

generate_repo "$PACKAGE"

yum remove -y ${INSTALL_PKGS}
dnf remove -y ${INSTALL_PKGS}

yum install -y ${INSTALL_PKGS}
dnf install -y ${INSTALL_PKGS}
exit $?
2 changes: 1 addition & 1 deletion packages/common-scripts/uninstall/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ source ${THISDIR}/../../../common/functions.sh
source ${THISDIR}/../include.sh

set -e
yum -y remove `get_all_packages_in_repo "${PACKAGE}"`
dnf -y remove `get_all_packages_in_repo "${PACKAGE}"`
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

yum install -y mariadb-java-client mariadb-java-client-tests hamcrest junit mariadb-server unzip
dnf install -y mariadb-java-client mariadb-java-client-tests hamcrest junit mariadb-server unzip

# list all available test classes
MARIADB_TESTS="$(unzip -Z1 $JAVA_LIBRARY_TESTS | grep 'Test.class' | cut -d'.' -f1 | tr '/' '.' | sort)"
Expand Down
2 changes: 1 addition & 1 deletion packages/mysql-common/basic-galera/deploy-galera.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ GARBD_CONFIG=${SYSCONF_DIR}/sysconfig/garb
IPS=$(hostname -I)
IP=${IPS%% *}

yum -y install ${GALERA_PKGS}
dnf -y install ${GALERA_PKGS}
cat >"${CONFIG_DIR}"/my-galera.cnf <<EOF
[mysqld]
wsrep_cluster_address="gcomm://${IP}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ service ${SERVICE_NAME} stop || :

CONFIG_DIR=${SYSCONF_DIR}/my.cnf.d

yum -y install ${INSTALL_PKGS} libselinux-utils
yum -y install policycoreutils-python || yum -y install policycoreutils-python-utils
dnf -y install ${INSTALL_PKGS} libselinux-utils
dnf -y install policycoreutils-python || dnf -y install policycoreutils-python-utils

# clean default config that might be taken into account,
# because order is not defined in configuration files reading
Expand Down Expand Up @@ -68,5 +68,5 @@ for instance in 1 2 3 ; do
rm -f ${CONFIG_DIR}/my-server$instance.cnf
done

yum reinstall -y ${INSTALL_PKGS}\*
dnf reinstall -y ${INSTALL_PKGS}\*