Sitelet https://github.com/kubernetes/kops/commit/b7735c54c911bfc2d316ef6c093f7d854923d818
Skip to content

Commit b7735c5

Browse files
hakmanhakman
committed
./hack/update-expected.sh
1 parent 63fd93e commit b7735c5

27 files changed

Lines changed: 135 additions & 162 deletions

File tree

‎tests/integration/update_cluster/gossip-gce/data/google_compute_instance_template_master-us-test1-a-gossip-k8s-local_metadata_user-data‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ download-or-bust() {
4848
while true; do
4949
for url in "${urls[@]}"; do
5050
commands=(
51-
"gcloud storage cp ${url} ${file}"
52-
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
53-
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
54-
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
55-
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
51+
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
52+
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10"
53+
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
54+
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10"
5655
)
5756
for cmd in "${commands[@]}"; do
5857
echo "== Downloading ${url} using ${cmd} =="
59-
if ! (${cmd}); then
58+
if ! (${cmd} "${url}"); then
6059
echo "== Failed to download ${url} using ${cmd} =="
6160
continue
6261
fi

‎tests/integration/update_cluster/gossip-gce/data/google_compute_instance_template_nodes-gossip-k8s-local_metadata_user-data‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ download-or-bust() {
4848
while true; do
4949
for url in "${urls[@]}"; do
5050
commands=(
51-
"gcloud storage cp ${url} ${file}"
52-
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
53-
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
54-
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
55-
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
51+
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
52+
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10"
53+
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
54+
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10"
5655
)
5756
for cmd in "${commands[@]}"; do
5857
echo "== Downloading ${url} using ${cmd} =="
59-
if ! (${cmd}); then
58+
if ! (${cmd} "${url}"); then
6059
echo "== Failed to download ${url} using ${cmd} =="
6160
continue
6261
fi

‎tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-a-ha-gce-example-com_metadata_user-data‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ download-or-bust() {
4848
while true; do
4949
for url in "${urls[@]}"; do
5050
commands=(
51-
"gcloud storage cp ${url} ${file}"
52-
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
53-
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
54-
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
55-
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
51+
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
52+
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10"
53+
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
54+
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10"
5655
)
5756
for cmd in "${commands[@]}"; do
5857
echo "== Downloading ${url} using ${cmd} =="
59-
if ! (${cmd}); then
58+
if ! (${cmd} "${url}"); then
6059
echo "== Failed to download ${url} using ${cmd} =="
6160
continue
6261
fi

‎tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-b-ha-gce-example-com_metadata_user-data‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ download-or-bust() {
4848
while true; do
4949
for url in "${urls[@]}"; do
5050
commands=(
51-
"gcloud storage cp ${url} ${file}"
52-
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
53-
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
54-
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
55-
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
51+
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
52+
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10"
53+
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
54+
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10"
5655
)
5756
for cmd in "${commands[@]}"; do
5857
echo "== Downloading ${url} using ${cmd} =="
59-
if ! (${cmd}); then
58+
if ! (${cmd} "${url}"); then
6059
echo "== Failed to download ${url} using ${cmd} =="
6160
continue
6261
fi

‎tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_master-us-test1-c-ha-gce-example-com_metadata_user-data‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ download-or-bust() {
4848
while true; do
4949
for url in "${urls[@]}"; do
5050
commands=(
51-
"gcloud storage cp ${url} ${file}"
52-
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
53-
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
54-
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
55-
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
51+
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
52+
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10"
53+
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
54+
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10"
5655
)
5756
for cmd in "${commands[@]}"; do
5857
echo "== Downloading ${url} using ${cmd} =="
59-
if ! (${cmd}); then
58+
if ! (${cmd} "${url}"); then
6059
echo "== Failed to download ${url} using ${cmd} =="
6160
continue
6261
fi

‎tests/integration/update_cluster/ha_gce/data/google_compute_instance_template_nodes-ha-gce-example-com_metadata_user-data‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ download-or-bust() {
4848
while true; do
4949
for url in "${urls[@]}"; do
5050
commands=(
51-
"gcloud storage cp ${url} ${file}"
52-
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
53-
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
54-
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
55-
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
51+
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
52+
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10"
53+
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
54+
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10"
5655
)
5756
for cmd in "${commands[@]}"; do
5857
echo "== Downloading ${url} using ${cmd} =="
59-
if ! (${cmd}); then
58+
if ! (${cmd} "${url}"); then
6059
echo "== Failed to download ${url} using ${cmd} =="
6160
continue
6261
fi

‎tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_master-us-test1-a-minimal-example-com_metadata_user-data‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ download-or-bust() {
4848
while true; do
4949
for url in "${urls[@]}"; do
5050
commands=(
51-
"gcloud storage cp ${url} ${file}"
52-
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
53-
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
54-
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
55-
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
51+
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
52+
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10"
53+
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
54+
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10"
5655
)
5756
for cmd in "${commands[@]}"; do
5857
echo "== Downloading ${url} using ${cmd} =="
59-
if ! (${cmd}); then
58+
if ! (${cmd} "${url}"); then
6059
echo "== Failed to download ${url} using ${cmd} =="
6160
continue
6261
fi

‎tests/integration/update_cluster/many-addons-gce/data/google_compute_instance_template_nodes-minimal-example-com_metadata_user-data‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ download-or-bust() {
4848
while true; do
4949
for url in "${urls[@]}"; do
5050
commands=(
51-
"gcloud storage cp ${url} ${file}"
52-
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
53-
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
54-
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
55-
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
51+
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
52+
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10"
53+
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
54+
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10"
5655
)
5756
for cmd in "${commands[@]}"; do
5857
echo "== Downloading ${url} using ${cmd} =="
59-
if ! (${cmd}); then
58+
if ! (${cmd} "${url}"); then
6059
echo "== Failed to download ${url} using ${cmd} =="
6160
continue
6261
fi

‎tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_master-us-test1-a-minimal-gce-example-com_metadata_user-data‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ download-or-bust() {
4848
while true; do
4949
for url in "${urls[@]}"; do
5050
commands=(
51-
"gcloud storage cp ${url} ${file}"
52-
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
53-
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
54-
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
55-
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
51+
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
52+
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10"
53+
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
54+
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10"
5655
)
5756
for cmd in "${commands[@]}"; do
5857
echo "== Downloading ${url} using ${cmd} =="
59-
if ! (${cmd}); then
58+
if ! (${cmd} "${url}"); then
6059
echo "== Failed to download ${url} using ${cmd} =="
6160
continue
6261
fi

‎tests/integration/update_cluster/minimal_gce/data/google_compute_instance_template_nodes-minimal-gce-example-com_metadata_user-data‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,14 @@ download-or-bust() {
4848
while true; do
4949
for url in "${urls[@]}"; do
5050
commands=(
51-
"gcloud storage cp ${url} ${file}"
52-
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
53-
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
54-
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10 ${url}"
55-
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10 ${url}"
51+
"curl -f --compressed -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
52+
"wget --compression=auto -O ${file} --connect-timeout=20 --tries=6 --wait=10"
53+
"curl -f -Lo ${file} --connect-timeout 20 --retry 6 --retry-delay 10"
54+
"wget -O ${file} --connect-timeout=20 --tries=6 --wait=10"
5655
)
5756
for cmd in "${commands[@]}"; do
5857
echo "== Downloading ${url} using ${cmd} =="
59-
if ! (${cmd}); then
58+
if ! (${cmd} "${url}"); then
6059
echo "== Failed to download ${url} using ${cmd} =="
6160
continue
6261
fi

0 commit comments

Comments
 (0)