mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Merge pull request #7874 from gyuho/scripts
integration/fixtures-expired: do not force 'rm'
This commit is contained in:
commit
7f05e220a4
@ -1,6 +1,11 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
if ! [[ "$0" =~ "./gencerts.sh" ]]; then
|
||||||
|
echo "must be run from 'fixtures-expired'"
|
||||||
|
exit 255
|
||||||
|
fi
|
||||||
|
|
||||||
if which cfssl >/dev/null; then
|
if which cfssl >/dev/null; then
|
||||||
echo "cfssl is installed; generating certs"
|
echo "cfssl is installed; generating certs"
|
||||||
else
|
else
|
||||||
@ -77,8 +82,8 @@ cfssl gencert \
|
|||||||
--config ./etcd-gencert.json \
|
--config ./etcd-gencert.json \
|
||||||
./server-ca-csr.json | cfssljson --bare ./server
|
./server-ca-csr.json | cfssljson --bare ./server
|
||||||
|
|
||||||
rm -f ./*.json
|
rm ./*.json
|
||||||
rm -f ./*.csr
|
rm ./*.csr
|
||||||
|
|
||||||
if which openssl >/dev/null; then
|
if which openssl >/dev/null; then
|
||||||
openssl x509 -in ./etcd-root-ca.pem -text -noout
|
openssl x509 -in ./etcd-root-ca.pem -text -noout
|
||||||
|
Loading…
x
Reference in New Issue
Block a user