Skip to content

Commit cec9cdf

Browse files
committed
Elemental3: (re)add '-f' option to curl when needed
With `assert_script_run` it could be useful to keep `-f` option to curl. Signed-off-by: Loic Devulder <ldevulder@suse.com>
1 parent 3c3ea4a commit cec9cdf

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

tests/elemental3/generate_image.pm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ sub customize_cmd {
7676

7777
# Download build configuration files
7878
assert_script_run(
79-
"curl -s -o $tpl_tar "
79+
"curl -sf -o $tpl_tar "
8080
. data_url('elemental3/' . path($tpl_tar)->basename)
8181
);
8282
assert_script_run("tar xzvf $tpl_tar -C $build_dir");
@@ -167,7 +167,7 @@ sub build_installer_cmd {
167167

168168
# OS configuration script
169169
assert_script_run(
170-
"curl -s -o $config_file "
170+
"curl -sf -o $config_file "
171171
. data_url('elemental3/' . path($config_file)->basename)
172172
);
173173
file_content_replace(
@@ -180,7 +180,7 @@ sub build_installer_cmd {
180180

181181
# ISO configuration script
182182
assert_script_run(
183-
"curl -s -o $iso_config_file "
183+
"curl -sf -o $iso_config_file "
184184
. data_url('elemental3/' . path($iso_config_file)->basename)
185185
);
186186
assert_script_run("chmod 755 $iso_config_file");
@@ -222,7 +222,7 @@ sub install_cmd {
222222

223223
# OS configuration script
224224
assert_script_run(
225-
"curl -s -o $config_file "
225+
"curl -sf -o $config_file "
226226
. data_url('elemental3/' . path($config_file)->basename)
227227
);
228228
file_content_replace(

tests/elemental3/start_k8s.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ sub prepare_test_framework {
195195
# Framework configuration files
196196
foreach my $file ('/tmp/env', '/tmp/tfvars') {
197197
assert_script_run(
198-
"curl -s -o $file "
198+
"curl -sf -o $file "
199199
. data_url('elemental3/test-framework/' . path($file)->basename)
200200
);
201201
file_content_replace(

tests/elemental3/test_framework.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ sub run {
3333
my $ssh_dir = '/root/.ssh';
3434
record_info('SSH config', 'Configure password-less SSH access');
3535
assert_script_run("mkdir -p $ssh_dir");
36-
assert_script_run("curl -s -o $ssh_dir/config " . data_url('elemental3/config.ssh'));
37-
assert_script_run("curl -s -o /tmp/id_ssh " . data_url('elemental3/id_ssh'));
36+
assert_script_run("curl -sf -o $ssh_dir/config " . data_url('elemental3/config.ssh'));
37+
assert_script_run("curl -sf -o /tmp/id_ssh " . data_url('elemental3/id_ssh'));
3838
assert_script_run("base64 -d /tmp/id_ssh > $ssh_dir/id_rsa");
3939
assert_script_run("chmod -R go-rwx $ssh_dir");
4040

0 commit comments

Comments
 (0)