Skip to content

Commit 69ee6b7

Browse files
kalebskeithleykalebskeithley
authored
Merge pull request #95 from psathyan/switchYUM
Switch to using dnf instead of yum
2 parents 27a1b1c + 531582f commit 69ee6b7

File tree

30 files changed

+285
-299
lines changed

30 files changed

+285
-299
lines changed

‎build_scripts/build-fsal/build-fsal_cephfs.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ case "${CENTOS_VERSION}" in
2929
yum install -y libcephfs-devel
3030
;;
3131
9s)
32-
yum install -y ${BUILDREQUIRES}
33-
yum install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
34-
yum install -y libcephfs-devel
32+
dnf install -y ${BUILDREQUIRES}
33+
dnf install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
34+
dnf install -y libcephfs-devel
3535
;;
3636
esac
3737

@@ -40,7 +40,7 @@ cd $(basename "${GERRIT_PROJECT}")
4040
git fetch origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
4141

4242
# update libntirpc
43-
git submodule update --recursive --init || git submodule sync
43+
git submodule update --recursive --init || git submodule sync --recursive
4444

4545
# cleanup old build dir
4646
[ -d build ] && rm -rf build

‎build_scripts/build-fsal/build-fsal_gluster.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -e
1111
GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}"
1212

1313
# enable the Storage SIG Gluster and Ceph repositories
14-
yum -y install centos-release-gluster
14+
dnf -y install centos-release-gluster
1515

1616
BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel"
1717

@@ -27,8 +27,8 @@ case "${CENTOS_VERSION}" in
2727
yum install --enablerepo=powertools -y ${BUILDREQUIRES_EXTRA}
2828
;;
2929
9s)
30-
yum install -y ${BUILDREQUIRES}
31-
yum install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
30+
dnf install -y ${BUILDREQUIRES}
31+
dnf install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
3232
;;
3333
esac
3434

@@ -37,7 +37,7 @@ cd $(basename "${GERRIT_PROJECT}")
3737
git fetch origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
3838

3939
# update libntirpc
40-
git submodule update --recursive --init || git submodule sync
40+
git submodule update --recursive --init || git submodule sync --recursive
4141

4242
# cleanup old build dir
4343
[ -d build ] && rm -rf build

‎build_scripts/build-fsal/build-fsal_gpfs.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -e
1111
GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}"
1212

1313
# enable the Storage SIG Gluster and Ceph repositories
14-
yum -y install centos-release-gluster
14+
dnf -y install centos-release-gluster
1515

1616
BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel"
1717

@@ -27,8 +27,8 @@ case "${CENTOS_VERSION}" in
2727
yum install --enablerepo=powertools -y ${BUILDREQUIRES_EXTRA}
2828
;;
2929
9s)
30-
yum install -y ${BUILDREQUIRES}
31-
yum install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
30+
dnf install -y ${BUILDREQUIRES}
31+
dnf install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
3232
;;
3333
esac
3434

@@ -37,7 +37,7 @@ cd $(basename "${GERRIT_PROJECT}")
3737
git fetch origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
3838

3939
# update libntirpc
40-
git submodule update --recursive --init || git submodule sync
40+
git submodule update --recursive --init || git submodule sync --recursive
4141

4242
# cleanup old build dir
4343
[ -d build ] && rm -rf build

‎build_scripts/build-fsal/build-fsal_rgw.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -e
1111
GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}"
1212

1313
# enable the Storage SIG Gluster and Ceph repositories
14-
yum -y install centos-release-ceph epel-release
14+
dnf -y install centos-release-ceph epel-release
1515

1616
BUILDREQUIRES="git bison cmake dbus-devel flex gcc-c++ krb5-devel libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build xfsprogs-devel"
1717

@@ -33,8 +33,8 @@ case "${CENTOS_VERSION}" in
3333
*)
3434
ENABLE_REPOS="--enablerepo=powertools"
3535
BUILDREQUIRES="${BUILDREQUIRES} python3-devel rpcgen libtirpc-devel liburing-devel rsync "
36-
yum -y update --skip-broken --nobest
37-
yum -y install epel-release
36+
dnf -y update --skip-broken --nobest
37+
dnf -y install epel-release
3838
;;
3939
esac
4040

@@ -43,7 +43,7 @@ cd $(basename "${GERRIT_PROJECT}")
4343
git fetch origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
4444

4545
# update libntirpc
46-
git submodule update --recursive --init || git submodule sync
46+
git submodule update --recursive --init || git submodule sync --recursive
4747

4848
# cleanup old build dir
4949
[ -d build ] && rm -rf build

‎build_scripts/build-tests/build-tests.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,30 @@ set -e
1111
GIT_REPO="https://${GERRIT_HOST}/${GERRIT_PROJECT}"
1212

1313
# enable the Storage SIG for lttng-{tools,ust}-devel
14-
yum -y install centos-release-gluster yum-utils centos-release-ceph epel-release
14+
dnf -y install centos-release-gluster yum-utils centos-release-ceph epel-release
1515

1616
BASE_PACKAGES="git bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel rpm-build redhat-rpm-config libacl-devel libblkid-devel libcap-devel gperftools-devel gtest-devel"
1717
BUILDREQUIRES_EXTRA="libnsl2-devel libnfsidmap-devel libwbclient-devel userspace-rcu-devel boost-devel doxygen xfsprogs-devel lttng-tools-devel lttng-ust-devel"
1818

1919
if [ "${CENTOS_VERSION}" = "7" ]; then
20-
yum -y install libgfapi-devel
21-
yum -y install ${BASE_PACKAGES} libnfsidmap-devel libwbclient-devel libcap-devel libblkid-devel userspace-rcu-devel userspace-rcu python2-devel
20+
yum -y install libgfapi-devel
21+
yum -y install ${BASE_PACKAGES} libnfsidmap-devel libwbclient-devel libcap-devel libblkid-devel userspace-rcu-devel userspace-rcu python2-devel
2222
elif [ "${CENTOS_VERSION}" = "8s" ]; then
23-
yum install -y ${BASE_PACKAGES} libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel
24-
yum install --enablerepo=powertools -y ${BUILDREQUIRES_EXTRA}
25-
yum -y install selinux-policy-devel sqlite libcephfs-devel
23+
yum install -y ${BASE_PACKAGES} libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel
24+
yum install --enablerepo=powertools -y ${BUILDREQUIRES_EXTRA}
25+
yum -y install selinux-policy-devel sqlite libcephfs-devel
2626
elif [ "${CENTOS_VERSION}" = "9s" ]; then
27-
yum install -y ${BASE_PACKAGES} libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel
28-
yum install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
29-
yum -y install selinux-policy-devel sqlite libcephfs-devel
27+
dnf install -y ${BASE_PACKAGES} libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel
28+
dnf install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
29+
dnf -y install selinux-policy-devel sqlite libcephfs-devel
3030
fi
3131

3232
git clone --depth=1 ${GIT_REPO}
3333
cd $(basename "${GERRIT_PROJECT}")
3434
git fetch --depth=1 origin ${GERRIT_REFSPEC} && git checkout FETCH_HEAD
3535

3636
# update libntirpc
37-
git submodule update --recursive --init || git submodule sync
37+
git submodule update --recursive --init || git submodule sync --recursive
3838

3939
# cleanup old build dir
4040
[ -d build ] && rm -rf build

‎build_scripts/code-compilation/client.sh‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@ set -x
1515

1616
# install build and runtime dependencies
1717
echo "Install build and runtime dependencies"
18-
yum -y install nfs-utils git gcc time centos-release-gluster centos-release-ceph
18+
dnf -y install nfs-utils git gcc time centos-release-gluster centos-release-ceph
1919

2020
# flag for commands which should run only once
2121
once=0
2222

2323
#NFS-Ganesha is crashing when installing 4.0, so taking it out to see if 4.1 works
2424

25-
for ver in 3 4.1
26-
do
25+
for ver in 3 4.1 ;do
2726
echo "--------------------------------------------------"
2827
echo "Running test on Mount Version $ver"
2928
echo "--------------------------------------------------"
@@ -32,18 +31,17 @@ do
3231
# mount
3332
mount -t nfs -o vers=$ver ${SERVER}:${EXPORT} /mnt/nfs
3433
cd /mnt/nfs
35-
if [ $once -eq 0 ]
36-
then
34+
if [ $once -eq 0 ]; then
3735
if [ "${CENTOS_VERSION}" == "7" ]; then
38-
yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libnfsidmap-devel libwbclient-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api libnsl2-devel libcephfs-devel
39-
yum clean all & yum clean metadata
40-
yum -y install userspace-rcu-devel
36+
yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libnfsidmap-devel libwbclient-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api libnsl2-devel libcephfs-devel
37+
yum clean all & yum clean metadata
38+
yum -y install userspace-rcu-devel
4139
elif [ "${CENTOS_VERSION}" == "8s" ]; then
42-
yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api
43-
yum -y --enablerepo=powertools install libnfsidmap-devel libwbclient-devel userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel
40+
yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api
41+
yum -y --enablerepo=powertools install libnfsidmap-devel libwbclient-devel userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel
4442
elif [ "${CENTOS_VERSION}" == "9s" ]; then
45-
yum -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api
46-
yum -y --enablerepo=crb install libnfsidmap-devel libwbclient-devel userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel libuuid libuuid-devel
43+
dnf -y install bison flex cmake gcc-c++ libacl-devel krb5-devel dbus-devel libcap-devel libblkid-devel rpm-build redhat-rpm-config glusterfs-api
44+
dnf -y --enablerepo=crb install libnfsidmap-devel libwbclient-devel userspace-rcu-devel userspace-rcu libnsl2-devel libcephfs-devel libuuid libuuid-devel
4745
fi
4846
timeout -s SIGKILL 600s git clone --depth=1 https://review.gerrithub.io/ffilz/nfs-ganesha
4947
TIMED_OUT=$?
@@ -56,18 +54,16 @@ do
5654
fi
5755
cd nfs-ganesha
5856
git checkout next
59-
if [ $once -eq 0 ]
60-
then
61-
git submodule update --recursive --init || git submodule sync
57+
if [ $once -eq 0 ] ; then
58+
git submodule update --recursive --init || git submodule sync --recursive
6259
once=1
6360
fi
6461
cd ..
6562
mkdir ganeshaBuild
6663
cd ganeshaBuild
6764
cmake -DDEBUG_SYMS=ON -DCURSES_LIBRARY=/usr/lib64 -DCURSES_INCLUDE_PATH=/usr/include/ncurses -DCMAKE_BUILD_TYPE=Maintainer -DUSE_DBUS=ON /mnt/nfs/nfs-ganesha/src
6865
status=$?
69-
if [ $status -ne 0 ]
70-
then
66+
if [ $status -ne 0 ] ; then
7167
echo "FAILURE: cmake failed"
7268
exit $status
7369
fi

‎build_scripts/common/basic-ceph.sh‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ set -e
2929
set -x
3030

3131
# enable repositories
32-
yum -y install centos-release-gluster yum-utils centos-release-ceph
32+
dnf -y install centos-release-gluster yum-utils centos-release-ceph
3333

3434
# make sure rpcbind is running
35-
yum -y install rpcbind
35+
dnf -y install rpcbind
3636
systemctl start rpcbind
3737

3838
# CentOS 7.4.1708 has an SELinux issue that prevents NFS-Ganesha from creating
@@ -49,7 +49,7 @@ then
4949
yum-config-manager --add-repo=${YUM_REPO}
5050

5151
# install the latest version of gluster
52-
yum -y install nfs-ganesha nfs-ganesha-gluster glusterfs-ganesha
52+
dnf -y install nfs-ganesha nfs-ganesha-gluster glusterfs-ganesha
5353

5454
# start nfs-ganesha service
5555
if ! systemctl start nfs-ganesha
@@ -78,9 +78,9 @@ else
7878
yum install --enablerepo=powertools -y ${BUILDREQUIRES_EXTRA}
7979
yum -y install selinux-policy-devel sqlite
8080
elif [ "${CENTOS_VERSION}" = "9s" ]; then
81-
yum install -y ${BASE_PACKAGES} libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel
82-
yum install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
83-
yum -y install selinux-policy-devel sqlite
81+
dnf install -y ${BASE_PACKAGES} libacl-devel libblkid-devel libcap-devel redhat-rpm-config rpm-build libgfapi-devel xfsprogs-devel
82+
dnf install --enablerepo=crb -y ${BUILDREQUIRES_EXTRA}
83+
dnf -y install selinux-policy-devel sqlite
8484
fi
8585

8686
git init "${GIT_REPO}"
@@ -98,12 +98,13 @@ else
9898
git checkout -b "${GERRIT_REFSPEC}" FETCH_HEAD
9999

100100
# update libntirpc
101-
git submodule update --recursive --init || git submodule sync
101+
git submodule update --recursive --init || git submodule sync --recursive
102102

103103
mkdir build
104104
pushd build
105105

106-
sleep 30000
106+
# FixMe: [psathyan] Not sure why we have a large sleep here.
107+
sleep 30000
107108

108109
cmake -DCMAKE_BUILD_TYPE=Maintainer -DUSE_FSAL_GLUSTER=ON ../src
109110
make dist
@@ -114,7 +115,7 @@ else
114115
ntirpc_version=$(rpm -q --qf '%{VERSION}-%{RELEASE}' -p ${rpm_arch}/libntirpc-devel*.rpm)
115116
ntirpc_rpm=${rpm_arch}/libntirpc-${ntirpc_version}.${rpm_arch}.rpm
116117
fi
117-
yum -y install {x86_64,noarch}/*.rpm
118+
dnf -y install {x86_64,noarch}/*.rpm
118119

119120
# start nfs-ganesha service with an empty configuration
120121
echo "NFSv4 { Graceless = true; }" > /etc/ganesha/ganesha.conf
@@ -130,11 +131,11 @@ fi
130131

131132
# create and start gluster volume
132133
if [ "${CENTOS_VERSION}" = "7" ]; then
133-
yum -y install glusterfs-server
134+
yum -y install glusterfs-server
134135
elif [ "${CENTOS_VERSION}" = "8s" ]; then
135-
yum -y install --enablerepo=powertools glusterfs-server
136+
yum -y install --enablerepo=powertools glusterfs-server
136137
elif [ "${CENTOS_VERSION}" = "9s" ]; then
137-
yum -y install --enablerepo=crb glusterfs-server
138+
dnf -y install --enablerepo=crb glusterfs-server
138139
fi
139140

140141
systemctl start glusterd
@@ -165,7 +166,7 @@ umount /mnt
165166
# Export the volume
166167
mkdir -p /usr/libexec/ganesha
167168
cd /usr/libexec/ganesha
168-
yum -y install wget
169+
dnf -y install wget
169170
wget https://raw.githubusercontent.com/gluster/glusterfs/release-3.10/extras/ganesha/scripts/create-export-ganesha.sh
170171
wget https://raw.githubusercontent.com/gluster/glusterfs/release-3.10/extras/ganesha/scripts/dbus-send.sh
171172
chmod 755 create-export-ganesha.sh dbus-send.sh

‎build_scripts/common/basic-gluster.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ else
139139
ntirpc_rpm=${rpm_arch}/libntirpc-${ntirpc_version}.${rpm_arch}.rpm
140140
fi
141141

142-
yum -y install {x86_64,noarch}/*.rpm
142+
dnf -y install {x86_64,noarch}/*.rpm
143143

144144
#Test block
145145
ulimit -a
@@ -164,7 +164,7 @@ if [ "${CENTOS_VERSION}" = "7" ]; then
164164
elif [ "${CENTOS_VERSION}" = "8s" ]; then
165165
yum -y install --enablerepo=powertools glusterfs-server
166166
elif [ "${CENTOS_VERSION}" = "9s" ]; then
167-
yum -y install --enablerepo=crb glusterfs-server
167+
dnf -y install --enablerepo=crb glusterfs-server
168168
fi
169169

170170
systemctl start glusterd
@@ -195,7 +195,7 @@ umount /mnt
195195
# Export the volume
196196
mkdir -p /usr/libexec/ganesha
197197
cd /usr/libexec/ganesha
198-
yum -y install wget
198+
dnf -y install wget
199199
wget https://raw.githubusercontent.com/gluster/glusterfs/release-3.10/extras/ganesha/scripts/create-export-ganesha.sh
200200
wget https://raw.githubusercontent.com/gluster/glusterfs/release-3.10/extras/ganesha/scripts/dbus-send.sh
201201
chmod 755 create-export-ganesha.sh dbus-send.sh

0 commit comments

Comments
 (0)