Skip to content

test: adjust log print in e2e test #1040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 13, 2023
Merged

test: adjust log print in e2e test #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51d152e
test: adjust log print in e2e test
andyzhangx Oct 11, 2023
9db3c7d
test: fix external e2e test
andyzhangx Oct 12, 2023
b5f65f2
test: fix test failures
andyzhangx Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions hack/verify-examples.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ EXAMPLES=(\
deploy/example/deployment.yaml \
deploy/example/statefulset.yaml \
deploy/example/statefulset-nonroot.yaml \
deploy/example/deployment-nfs.yaml \
deploy/example/statefulset-nfs.yaml \
deploy/example/statefulset-nonroot-nfs.yaml \
)

for EXAMPLE in "${EXAMPLES[@]}"; do
Expand Down
4 changes: 2 additions & 2 deletions test/external-e2e/testdriver-blobfuse.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ShortName: blobfuse
StorageClass:
FromFile: /tmp/csi/storageclass.yaml
DriverInfo:
Name: test.csi.azure.com
Name: blob.csi.azure.com
Capabilities:
persistence: true
exec: true
Expand All @@ -16,4 +16,4 @@ DriverInfo:
controllerExpansion: true
nodeExpansion: true
volumeLimits: false
snapshotDataSource: false
snapshotDataSource: false
2 changes: 1 addition & 1 deletion test/external-e2e/testdriver-nfs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ShortName: blobfuse
StorageClass:
FromFile: /tmp/csi/storageclass.yaml
DriverInfo:
Name: test.csi.azure.com
Name: blob.csi.azure.com
Capabilities:
persistence: true
exec: true
Expand Down
17 changes: 10 additions & 7 deletions test/utils/blob_log.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

set -e
# set -e

NS=kube-system
CONTAINER=blob
Expand Down Expand Up @@ -49,11 +49,6 @@ kubectl get pods -n${NS} -l${LABEL} \
| awk 'NR>1 {print $1}' \
| xargs -I {} kubectl logs {} --prefix -c${CONTAINER} -n${NS}

echo "print out cloudprovider_azure metrics ..."
echo "======================================================================================"
ip=`kubectl get svc csi-$DRIVER-controller -n kube-system | awk '{print $4}'`
curl http://$ip:29634/metrics

if [ -n "$ENABLE_BLOBFUSE_PROXY" ]; then
echo "print out install-blobfuse-proxy logs ..."
echo "======================================================================================"
Expand All @@ -64,4 +59,12 @@ if [ -n "$ENABLE_BLOBFUSE_PROXY" ]; then
| xargs -I {} kubectl logs {} --prefix -c${PROXY} -n${NS}
fi


echo "======================================================================================"
ip=`kubectl get svc csi-$DRIVER-controller -n kube-system | awk '{print $4}'`
if echo "$ip" | grep -q "\."; then
echo "print out cloudprovider_azure metrics ..."
curl http://$ip:29634/metrics
else
echo "csi-$DRIVER-controller service ip is empty"
kubectl get svc csi-$DRIVER-controller -n kube-system
fi