github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74601 from mrbobbytables/fix-test-image-shellcheck 

Fix shellcheck lint errors in test/images/* scripts
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-17 02:22:03 -07:00 committed by GitHub
parent b359b6bfe7 5518defffc
commit c3bec0bae4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/.shellcheck_failures
View File

@ -85,6 +85,3 @@
./test/e2e_node/environment/setup_host.sh ./test/e2e_node/environment/setup_host.sh
./test/e2e_node/gubernator.sh ./test/e2e_node/gubernator.sh
./test/images/image-util.sh ./test/images/image-util.sh
./test/images/volume/gluster/run_gluster.sh
./test/images/volume/iscsi/create_block.sh
./test/images/volume/nfs/run_nfs.sh

16
test/images/volume/gluster/run_gluster.sh
View File

@ -14,24 +14,24 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
DIR=`mktemp -d` DIR="$(mktemp -d)"
function start() function start()
{ {
mount -t tmpfs test $DIR mount -t tmpfs test "$DIR"
chmod 755 $DIR chmod 755 "$DIR"
cp /vol/* $DIR/ cp /vol/* "$DIR/"
/usr/sbin/glusterd -p /run/glusterd.pid /usr/sbin/glusterd -p /run/glusterd.pid
gluster volume create test_vol `hostname -i`:$DIR force gluster volume create test_vol "$(hostname -i):$DIR" force
gluster volume start test_vol gluster volume start test_vol
} }
function stop() function stop()
{ {
gluster --mode=script volume stop test_vol force gluster --mode=script volume stop test_vol force
kill $(cat /run/glusterd.pid) kill "$(cat /run/glusterd.pid)"
umount $DIR umount "$DIR"
rm -rf $DIR rm -rf "$DIR"
exit 0 exit 0
} }

12
test/images/volume/iscsi/create_block.sh
View File

@ -17,7 +17,7 @@
# Exit on the first error. # Exit on the first error.
set -e set -e
MNTDIR=`mktemp -d` MNTDIR="$(mktemp -d)"
cleanup() cleanup()
{ {
@ -25,8 +25,8 @@ cleanup()
RET=$? RET=$?
# Silently remove everything and ignore errors # Silently remove everything and ignore errors
set +e set +e
/bin/umount $MNTDIR 2>/dev/null /bin/umount "$MNTDIR" 2>/dev/null
/bin/rmdir $MNTDIR 2>/dev/null /bin/rmdir "$MNTDIR" 2>/dev/null
/bin/rm block 2>/dev/null /bin/rm block 2>/dev/null
exit $RET exit $RET
} }
@ -39,9 +39,9 @@ dd if=/dev/zero of=block seek=120 count=1 bs=1M
mkfs.ext2 block mkfs.ext2 block
# Add index.html to it # Add index.html to it
mount -o loop block $MNTDIR mount -o loop block "$MNTDIR"
echo "Hello from iscsi" > $MNTDIR/index.html echo "Hello from iscsi" > "$MNTDIR/index.html"
umount $MNTDIR umount "$MNTDIR"
rm block.tar.gz 2>/dev/null || : rm block.tar.gz 2>/dev/null || :
tar cfz block.tar.gz block tar cfz block.tar.gz block

13
test/images/volume/nfs/run_nfs.sh
View File

@ -22,21 +22,22 @@ function start()
while getopts "G:" opt; do while getopts "G:" opt; do
case ${opt} in case ${opt} in
G) gid=${OPTARG};; G) gid=${OPTARG};;
*):;;
esac esac
done done
shift $(($OPTIND - 1)) shift $((OPTIND - 1))
# prepare /etc/exports # prepare /etc/exports
for i in "$@"; do for i in "$@"; do
# fsid=0: needed for NFSv4 # fsid=0: needed for NFSv4
echo "$i *(rw,fsid=0,insecure,no_root_squash)" >> /etc/exports echo "$i *(rw,fsid=0,insecure,no_root_squash)" >> /etc/exports
if [ -v gid ] ; then if [ -v gid ] ; then
chmod 070 $i chmod 070 "$i"
chgrp $gid $i chgrp "$gid" "$i"
fi fi
# move index.html to here # move index.html to here
/bin/cp /tmp/index.html $i/ /bin/cp /tmp/index.html "$i/"
chmod 644 $i/index.html chmod 644 "$i/index.html"
echo "Serving $i" echo "Serving $i"
done done
@ -67,7 +68,7 @@ function stop()
/usr/sbin/exportfs -au /usr/sbin/exportfs -au
/usr/sbin/exportfs -f /usr/sbin/exportfs -f
kill $( pidof rpc.mountd ) kill "$( pidof rpc.mountd )"
umount /proc/fs/nfsd umount /proc/fs/nfsd
echo > /etc/exports echo > /etc/exports
exit 0 exit 0