wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pkg/utils, test/system: Use the Ubuntu images from quay.io/toolbx/...

Browse source 
https://github.com/containers/toolbox/pull/1306
This commit is contained in:
Debarshi Ray 2023-06-08 14:52:14 +02:00
parent 8dcd5d7cb4
commit b6ca18ead1
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pkg/utils/utils.go
View file

@ -351,7 +351,7 @@ func getFullyQualifiedImageRHEL(image, release string) string {
}
func getFullyQualifiedImageUbuntu(image, release string) string {
imageFull := "quay.io/toolbx-images/" + image
imageFull := "quay.io/toolbx/" + image
return imageFull
}

12
test/system/102-list.bats
View file

@ -188,7 +188,7 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" list
assert_success
assert_line --index 1 --partial "quay.io/toolbx-images/ubuntu-toolbox:16.04"
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:16.04"
assert [ ${#lines[@]} -eq 3 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}
@ -203,7 +203,7 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" list --images
assert_success
assert_line --index 1 --partial "quay.io/toolbx-images/ubuntu-toolbox:16.04"
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:16.04"
assert [ ${#lines[@]} -eq 3 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}
@ -218,7 +218,7 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" list
assert_success
assert_line --index 1 --partial "quay.io/toolbx-images/ubuntu-toolbox:18.04"
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:18.04"
assert [ ${#lines[@]} -eq 3 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}
@ -233,7 +233,7 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" list --images
assert_success
assert_line --index 1 --partial "quay.io/toolbx-images/ubuntu-toolbox:18.04"
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:18.04"
assert [ ${#lines[@]} -eq 3 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}
@ -248,7 +248,7 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" list
assert_success
assert_line --index 1 --partial "quay.io/toolbx-images/ubuntu-toolbox:20.04"
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:20.04"
assert [ ${#lines[@]} -eq 3 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}
@ -263,7 +263,7 @@ teardown() {
run --keep-empty-lines --separate-stderr "$TOOLBOX" list --images
assert_success
assert_line --index 1 --partial "quay.io/toolbx-images/ubuntu-toolbox:20.04"
assert_line --index 1 --partial "quay.io/toolbx/ubuntu-toolbox:20.04"
assert [ ${#lines[@]} -eq 3 ]
assert [ ${#stderr_lines[@]} -eq 0 ]
}

2
test/system/libs/helpers.bash
View file

@ -27,7 +27,7 @@ declare -Ag IMAGES=([busybox]="quay.io/toolbox_tests/busybox" \
[docker-reg]="quay.io/toolbox_tests/registry" \
[fedora]="registry.fedoraproject.org/fedora-toolbox" \
[rhel]="registry.access.redhat.com/ubi8/toolbox" \
[ubuntu]="quay.io/toolbx-images/ubuntu-toolbox")
[ubuntu]="quay.io/toolbx/ubuntu-toolbox")
function cleanup_all() {