Fix static check for .sh files

Signed-off-by: Madhu Rajanna <mrajanna@redhat.com>
This commit is contained in:
Madhu Rajanna 2019-02-07 15:29:10 +05:30 committed by mergify[bot]
parent 7043b3839a
commit 3c50cb124b
9 changed files with 42 additions and 43 deletions

View File

@ -1,15 +1,15 @@
#!/bin/bash #!/bin/bash
if [ "${TRAVIS_BRANCH}" == 'master' ]; then if [ "${TRAVIS_BRANCH}" == 'master' ]; then
export RBD_IMAGE_VERSION='v0.3.0'; export RBD_IMAGE_VERSION='v0.3.0'
export CEPHFS_IMAGE_VERSION='v0.3.0'; export CEPHFS_IMAGE_VERSION='v0.3.0'
elif [ "${TRAVIS_BRANCH}" == 'csi-v1.0' ]; then elif [ "${TRAVIS_BRANCH}" == 'csi-v1.0' ]; then
export RBD_IMAGE_VERSION='v1.0.0'; export RBD_IMAGE_VERSION='v1.0.0'
export CEPHFS_IMAGE_VERSION='v1.0.0'; export CEPHFS_IMAGE_VERSION='v1.0.0'
else else
echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"; echo "!!! Branch ${TRAVIS_BRANCH} is not a deployable branch; exiting"
exit 0; # Exiting 0 so that this isn't marked as failing exit 0 # Exiting 0 so that this isn't marked as failing
fi; fi
if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
docker login -u "${QUAY_IO_USERNAME}" -p "${QUAY_IO_PASSWORD}" quay.io docker login -u "${QUAY_IO_USERNAME}" -p "${QUAY_IO_PASSWORD}" quay.io
@ -18,37 +18,36 @@ if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
set -xe set -xe
mkdir -p tmp mkdir -p tmp
pushd tmp > /dev/null pushd tmp >/dev/null
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get > get_helm.sh curl https://raw.githubusercontent.com/helm/helm/master/scripts/get >get_helm.sh
chmod 700 get_helm.sh chmod 700 get_helm.sh
./get_helm.sh ./get_helm.sh
git clone https://github.com/ceph/csi-charts git clone https://github.com/ceph/csi-charts
mkdir -p csi-charts/docs mkdir -p csi-charts/docs
popd > /dev/null popd >/dev/null
CHANGED=0 CHANGED=0
VERSION=$(cat deploy/rbd/helm/Chart.yaml | awk '{if(/^version:/){print $2}}') VERSION=$(grep 'version:' deploy/rbd/helm/Chart.yaml | awk '{print $2}')
if [ ! -f "tmp/csi-charts/docs/rbd/ceph-csi-rbd-$VERSION.tgz" ]; then if [ ! -f "tmp/csi-charts/docs/rbd/ceph-csi-rbd-$VERSION.tgz" ]; then
CHANGED=1 CHANGED=1
ln -s helm deploy/rbd/ceph-csi-rbd ln -s helm deploy/rbd/ceph-csi-rbd
mkdir -p tmp/csi-charts/docs/rbd mkdir -p tmp/csi-charts/docs/rbd
pushd tmp/csi-charts/docs/rbd > /dev/null pushd tmp/csi-charts/docs/rbd >/dev/null
helm init --client-only helm init --client-only
helm package ../../../../deploy/rbd/ceph-csi-rbd helm package ../../../../deploy/rbd/ceph-csi-rbd
popd > /dev/null popd >/dev/null
fi fi
if [ $CHANGED -eq 1 ]; then if [ $CHANGED -eq 1 ]; then
pushd tmp/csi-charts/docs > /dev/null pushd tmp/csi-charts/docs >/dev/null
helm repo index . helm repo index .
git add --all :/ && git commit -m "Update repo" git add --all :/ && git commit -m "Update repo"
git push https://"$GITHUB_TOKEN"@github.com/ceph/csi-charts git push https://"$GITHUB_TOKEN"@github.com/ceph/csi-charts
popd > /dev/null popd >/dev/null
fi fi
fi; fi

View File

@ -4,7 +4,7 @@ CONTAINER_NAME=csi-cephfsplugin
POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1) POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1)
function get_pod_status() { function get_pod_status() {
echo -n $(kubectl get $POD_NAME -o jsonpath="{.status.phase}") echo -n "$(kubectl get "$POD_NAME" -o jsonpath="{.status.phase}")"
} }
while [[ "$(get_pod_status)" != "Running" ]]; do while [[ "$(get_pod_status)" != "Running" ]]; do
@ -12,4 +12,4 @@ while [[ "$(get_pod_status)" != "Running" ]]; do
echo "Waiting for $POD_NAME (status $(get_pod_status))" echo "Waiting for $POD_NAME (status $(get_pod_status))"
done done
kubectl exec -it ${POD_NAME#*/} -c $CONTAINER_NAME bash kubectl exec -it "${POD_NAME#*/}" -c "$CONTAINER_NAME" bash

View File

@ -4,7 +4,7 @@ CONTAINER_NAME=csi-cephfsplugin
POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1) POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1)
function get_pod_status() { function get_pod_status() {
echo -n $(kubectl get $POD_NAME -o jsonpath="{.status.phase}") echo -n "$(kubectl get "$POD_NAME" -o jsonpath="{.status.phase}")"
} }
while [[ "$(get_pod_status)" != "Running" ]]; do while [[ "$(get_pod_status)" != "Running" ]]; do
@ -12,4 +12,4 @@ while [[ "$(get_pod_status)" != "Running" ]]; do
echo "Waiting for $POD_NAME (status $(get_pod_status))" echo "Waiting for $POD_NAME (status $(get_pod_status))"
done done
kubectl logs -f $POD_NAME -c $CONTAINER_NAME kubectl logs -f "$POD_NAME" -c "$CONTAINER_NAME"

View File

@ -10,6 +10,6 @@ cd "$deployment_base" || exit 1
objects=(csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac csi-cephfsplugin-attacher csi-cephfsplugin-provisioner csi-cephfsplugin) objects=(csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac csi-cephfsplugin-attacher csi-cephfsplugin-provisioner csi-cephfsplugin)
for obj in ${objects[@]}; do for obj in "${objects[@]}"; do
kubectl create -f "./$obj.yaml" kubectl create -f "./$obj.yaml"
done done

View File

@ -10,6 +10,6 @@ cd "$deployment_base" || exit 1
objects=(csi-cephfsplugin-attacher csi-cephfsplugin-provisioner csi-cephfsplugin csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac) objects=(csi-cephfsplugin-attacher csi-cephfsplugin-provisioner csi-cephfsplugin csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac)
for obj in ${objects[@]}; do for obj in "${objects[@]}"; do
kubectl delete -f "./$obj.yaml" kubectl delete -f "./$obj.yaml"
done done

View File

@ -4,7 +4,7 @@ CONTAINER_NAME=csi-rbdplugin
POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1) POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1)
function get_pod_status() { function get_pod_status() {
echo -n $(kubectl get $POD_NAME -o jsonpath="{.status.phase}") echo -n "$(kubectl get "$POD_NAME" -o jsonpath="{.status.phase}")"
} }
while [[ "$(get_pod_status)" != "Running" ]]; do while [[ "$(get_pod_status)" != "Running" ]]; do
@ -12,4 +12,4 @@ while [[ "$(get_pod_status)" != "Running" ]]; do
echo "Waiting for $POD_NAME (status $(get_pod_status))" echo "Waiting for $POD_NAME (status $(get_pod_status))"
done done
kubectl exec -it ${POD_NAME#*/} -c $CONTAINER_NAME bash kubectl exec -it "${POD_NAME#*/}" -c "$CONTAINER_NAME" bash

View File

@ -4,7 +4,7 @@ CONTAINER_NAME=csi-rbdplugin
POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1) POD_NAME=$(kubectl get pods -l app=$CONTAINER_NAME -o=name | head -n 1)
function get_pod_status() { function get_pod_status() {
echo -n $(kubectl get $POD_NAME -o jsonpath="{.status.phase}") echo -n "$(kubectl get "$POD_NAME" -o jsonpath="{.status.phase}")"
} }
while [[ "$(get_pod_status)" != "Running" ]]; do while [[ "$(get_pod_status)" != "Running" ]]; do
@ -12,4 +12,4 @@ while [[ "$(get_pod_status)" != "Running" ]]; do
echo "Waiting for $POD_NAME (status $(get_pod_status))" echo "Waiting for $POD_NAME (status $(get_pod_status))"
done done
kubectl logs -f $POD_NAME -c $CONTAINER_NAME kubectl logs -f "$POD_NAME" -c "$CONTAINER_NAME"

View File

@ -10,6 +10,6 @@ cd "$deployment_base" || exit 1
objects=(csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac csi-rbdplugin-attacher csi-rbdplugin-provisioner csi-rbdplugin) objects=(csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac csi-rbdplugin-attacher csi-rbdplugin-provisioner csi-rbdplugin)
for obj in ${objects[@]}; do for obj in "${objects[@]}"; do
kubectl create -f "./$obj.yaml" kubectl create -f "./$obj.yaml"
done done

View File

@ -10,6 +10,6 @@ cd "$deployment_base" || exit 1
objects=(csi-rbdplugin-attacher csi-rbdplugin-provisioner csi-rbdplugin csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac) objects=(csi-rbdplugin-attacher csi-rbdplugin-provisioner csi-rbdplugin csi-attacher-rbac csi-provisioner-rbac csi-nodeplugin-rbac)
for obj in ${objects[@]}; do for obj in "${objects[@]}"; do
kubectl delete -f "./$obj.yaml" kubectl delete -f "./$obj.yaml"
done done