integration/fixtures-expired: do not force 'rm'

To make gencerts.sh script safer.

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
release-3.2
Gyu-Ho Lee 2017-05-03 18:45:44 -07:00
parent 3b251b0ed3
commit 4edbae4a91
1 changed files with 7 additions and 2 deletions

View File

@ -1,6 +1,11 @@
#!/usr/bin/env bash
set -e
if ! [[ "$0" =~ "./gencerts.sh" ]]; then
echo "must be run from 'fixtures-expired'"
exit 255
fi
if which cfssl >/dev/null; then
echo "cfssl is installed; generating certs"
else
@ -77,8 +82,8 @@ cfssl gencert \
--config ./etcd-gencert.json \
./server-ca-csr.json | cfssljson --bare ./server
rm -f ./*.json
rm -f ./*.csr
rm ./*.json
rm ./*.csr
if which openssl >/dev/null; then
openssl x509 -in ./etcd-root-ca.pem -text -noout