Merge branch 'stable-3.5' into stable-3.9
* stable-3.5:
test: Remove duplicate JSON parsing
Release-Notes: skip
Change-Id: I7d818f810668ec880587cdc84e7f6b9db70b89de
diff --git a/test/docker/run_tests/Dockerfile b/test/docker/run_tests/Dockerfile
index b3062da..1ecd6b3 100755
--- a/test/docker/run_tests/Dockerfile
+++ b/test/docker/run_tests/Dockerfile
@@ -6,7 +6,7 @@
ENV USER_HOME /home/$USER
ENV WORKSPACE $USER_HOME/workspace
-RUN apk --update add --no-cache openssh bash git util-linux openssl shadow curl jq python
+RUN apk --update add --no-cache openssh bash git util-linux openssl shadow curl jq
RUN echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config
RUN groupadd -f -g $GID users2
diff --git a/test/test_dependson.sh b/test/test_dependson.sh
index 284768e..6dc4a0e 100755
--- a/test/test_dependson.sh
+++ b/test/test_dependson.sh
@@ -4,8 +4,7 @@
gssh() { ssh -x -p "$PORT" "$SERVER" "$@" ; 2>&1 ; } # [args]...
query_ssh() {
- gssh gerrit query --format=json "$@" | head -1 | \
- python -c 'import sys,json; print json.dumps(json.load(sys.stdin))'
+ gssh gerrit query --format=json "$@" | head -1
}
query_http() { # query > changes_list
