airship
/
promenade
Code Issues Proposed changes

Merge "Enable gate shell linting"

This commit is contained in:
Zuul 2018-09-10 17:32:00 +00:00 committed by Gerrit Code Review
parent c7bee46629 ee10b894bf
commit 6e4ea38955
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/g2/lib/kube.sh
View File

@ -50,19 +50,19 @@ kubectl_wait_for_node_ready() {
NODE_NAME=${2} NODE_NAME=${2}
SEC=${3:-300} SEC=${3:-300}
log Waiting $SEC seconds for $NODE_NAME to be ready. log Waiting "${SEC}" seconds for "${NODE_NAME}" to be ready.
NODE_READY_JSONPATH='{.status.conditions[?(@.type=="Ready")].status}' NODE_READY_JSONPATH='{.status.conditions[?(@.type=="Ready")].status}'
end=$(($(date +%s) + $SEC)) end=$(($(date +%s) + SEC))
while true; do while true; do
if (kubectl_cmd "${VIA}" --request-timeout 10s get nodes $NODE_NAME -o jsonpath="${NODE_READY_JSONPATH}" | grep True) ; then if (kubectl_cmd "${VIA}" --request-timeout 10s get nodes "${NODE_NAME}" -o jsonpath="${NODE_READY_JSONPATH}" | grep True) ; then
log Node $NODE_NAME is ready. log Node "${NODE_NAME}" is ready.
break break
else else
now=$(date +%s) now=$(date +%s)
if [ $now -gt $end ]; then if [ "${now}" -gt "${end}" ]; then
log Node $NODE_NAME was not ready before timeout. log Node "${NODE_NAME}" was not ready before timeout.
fail fail
fi fi
echo -n . echo -n .

4
tools/zuul/playbooks/unit-py35.yaml → tools/zuul/playbooks/make-tests.yaml
View File

@ -12,9 +12,9 @@
- hosts: primary - hosts: primary
tasks: tasks:
- name: Execute the make target for unit testing - name: Execute the make target for basic testing
make: make:
chdir: "{{ zuul.project.src_dir }}" chdir: "{{ zuul.project.src_dir }}"
target: tests-unit target: tests
register: result register: result
failed_when: result.failed failed_when: result.failed