Skip to content

Commit

Permalink
Merge pull request os-autoinst#19401 from ricardobranco777/busybox
Browse files Browse the repository at this point in the history
containers: Use registry.opensuse.org/opensuse/busybox instead of BCI
  • Loading branch information
ricardobranco777 authored May 28, 2024
2 parents d5a6396 + dc33ff5 commit e2af63c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/containers/firewall.pm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sub run {
}

# Run netcat in container and check that we can reach it
my $image = "registry.opensuse.org/opensuse/bci/bci-busybox:latest";
my $image = "registry.opensuse.org/opensuse/busybox:latest";
assert_script_run "$runtime pull $image";
assert_script_run "$runtime run -d --name $container_name -p 1234:1234 $image nc -l -p 1234";
assert_script_run "echo Hola Mundo >/dev/tcp/127.0.0.1/1234";
Expand Down
2 changes: 1 addition & 1 deletion tests/containers/podman_netavark.pm
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ sub run {
subnet => '10.64.0.0/16',
};
my $ctr2 = {
image => 'registry.opensuse.org/opensuse/bci/bci-busybox',
image => 'registry.opensuse.org/opensuse/busybox',
name => 'busybox_ctr',
ip => '10.64.0.8',
mac => '92:aa:33:44:55:66',
Expand Down
4 changes: 2 additions & 2 deletions tests/containers/secret.pm
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ sub run {

# Run a container passing secret1 as default and secret2 as an env variable
record_info("Access secrets");
script_retry("podman pull registry.opensuse.org/opensuse/bci/bci-busybox:latest",
script_retry("podman pull registry.opensuse.org/opensuse/busybox:latest",
retry => 3, delay => 10, timeout => 120);
validate_script_output("podman run --name secret-test --secret secret1 --secret secret2,type=env,target=TOP_SECRET2 bci-busybox:latest /bin/sh -c 'cat /run/secrets/secret1; echo; printenv TOP_SECRET2'", sub { m/T0p_S3cr3t1\nT0p_S3cr3t2/ });
validate_script_output("podman run --name secret-test --secret secret1 --secret secret2,type=env,target=TOP_SECRET2 registry.opensuse.org/opensuse/busybox:latest /bin/sh -c 'cat /run/secrets/secret1; echo; printenv TOP_SECRET2'", sub { m/T0p_S3cr3t1\nT0p_S3cr3t2/ });

# Commit the container and check that the secrets are not in it
record_info("Commit cont", "Commit container secret-test");
Expand Down
2 changes: 1 addition & 1 deletion tests/containers/volumes.pm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ sub run {
assert_script_run("mkdir -p $test_dir");

# Create Dockerfile with VOLUME defined
assert_script_run("echo -e 'FROM registry.opensuse.org/opensuse/bci/bci-busybox:latest\\nVOLUME /$test_dir' > $test_dir/Dockerfile");
assert_script_run("echo -e 'FROM registry.opensuse.org/opensuse/busybox:latest\\nVOLUME /$test_dir' > $test_dir/Dockerfile");

# Build image
assert_script_run("$runtime build -t $test_image -f $test_dir/Dockerfile $test_dir/");
Expand Down

0 comments on commit e2af63c

Please sign in to comment.