Skip to content
This repository has been archived by the owner on Jul 28, 2019. It is now read-only.

Commit

Permalink
[testing] enable tracing
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan Shvedunov committed Nov 14, 2018
1 parent ccf5259 commit bebfb81
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions dind-cluster.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
# Copyright 2017 Mirantis
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -1062,7 +1062,7 @@ function dind::kubeadm {
# See image/bare/wrapkubeadm.
# Capturing output is necessary to grab flags for 'kubeadm join'
kubelet_feature_gates="-e KUBELET_FEATURE_GATES=${KUBELET_FEATURE_GATES}"
if ! docker exec ${kubelet_feature_gates} "${container_id}" /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
if ! docker exec ${kubelet_feature_gates} "${container_id}" /bin/bash -x /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
echo "*** kubeadm failed" >&2
return 1
fi
Expand Down
4 changes: 2 additions & 2 deletions fixed/dind-cluster-stable.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
# Copyright 2017 Mirantis
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -1062,7 +1062,7 @@ function dind::kubeadm {
# See image/bare/wrapkubeadm.
# Capturing output is necessary to grab flags for 'kubeadm join'
kubelet_feature_gates="-e KUBELET_FEATURE_GATES=${KUBELET_FEATURE_GATES}"
if ! docker exec ${kubelet_feature_gates} "${container_id}" /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
if ! docker exec ${kubelet_feature_gates} "${container_id}" /bin/bash -x /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
echo "*** kubeadm failed" >&2
return 1
fi
Expand Down
4 changes: 2 additions & 2 deletions fixed/dind-cluster-v1.10.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
# Copyright 2017 Mirantis
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -1062,7 +1062,7 @@ function dind::kubeadm {
# See image/bare/wrapkubeadm.
# Capturing output is necessary to grab flags for 'kubeadm join'
kubelet_feature_gates="-e KUBELET_FEATURE_GATES=${KUBELET_FEATURE_GATES}"
if ! docker exec ${kubelet_feature_gates} "${container_id}" /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
if ! docker exec ${kubelet_feature_gates} "${container_id}" /bin/bash -x /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
echo "*** kubeadm failed" >&2
return 1
fi
Expand Down
4 changes: 2 additions & 2 deletions fixed/dind-cluster-v1.11.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
# Copyright 2017 Mirantis
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -1062,7 +1062,7 @@ function dind::kubeadm {
# See image/bare/wrapkubeadm.
# Capturing output is necessary to grab flags for 'kubeadm join'
kubelet_feature_gates="-e KUBELET_FEATURE_GATES=${KUBELET_FEATURE_GATES}"
if ! docker exec ${kubelet_feature_gates} "${container_id}" /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
if ! docker exec ${kubelet_feature_gates} "${container_id}" /bin/bash -x /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
echo "*** kubeadm failed" >&2
return 1
fi
Expand Down
4 changes: 2 additions & 2 deletions fixed/dind-cluster-v1.12.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
# Copyright 2017 Mirantis
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -1062,7 +1062,7 @@ function dind::kubeadm {
# See image/bare/wrapkubeadm.
# Capturing output is necessary to grab flags for 'kubeadm join'
kubelet_feature_gates="-e KUBELET_FEATURE_GATES=${KUBELET_FEATURE_GATES}"
if ! docker exec ${kubelet_feature_gates} "${container_id}" /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
if ! docker exec ${kubelet_feature_gates} "${container_id}" /bin/bash -x /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
echo "*** kubeadm failed" >&2
return 1
fi
Expand Down
4 changes: 2 additions & 2 deletions fixed/dind-cluster-v1.9.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/bash -x
# Copyright 2017 Mirantis
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -1062,7 +1062,7 @@ function dind::kubeadm {
# See image/bare/wrapkubeadm.
# Capturing output is necessary to grab flags for 'kubeadm join'
kubelet_feature_gates="-e KUBELET_FEATURE_GATES=${KUBELET_FEATURE_GATES}"
if ! docker exec ${kubelet_feature_gates} "${container_id}" /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
if ! docker exec ${kubelet_feature_gates} "${container_id}" /bin/bash -x /usr/local/bin/wrapkubeadm "$@" 2>&1 | tee /dev/fd/2; then
echo "*** kubeadm failed" >&2
return 1
fi
Expand Down

0 comments on commit bebfb81

Please sign in to comment.