From b6ca18ead1cdfc65d70d87849e5a712f06face82 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Thu, 8 Jun 2023 14:52:14 +0200
Subject: [PATCH] pkg/utils, test/system: Use the Ubuntu images from
 quay.io/toolbx/...

https://github.com/containers/toolbox/pull/1306
---
 src/pkg/utils/utils.go        |  2 +-
 test/system/102-list.bats     | 12 ++++++------
 test/system/libs/helpers.bash |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/pkg/utils/utils.go b/src/pkg/utils/utils.go
index b2b6e6024..f5ba5da73 100644
--- a/src/pkg/utils/utils.go
+++ b/src/pkg/utils/utils.go
@@ -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
 }
 
diff --git a/test/system/102-list.bats b/test/system/102-list.bats
index 15c40701d..e25e81611 100644
--- a/test/system/102-list.bats
+++ b/test/system/102-list.bats
@@ -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 ]
 }
diff --git a/test/system/libs/helpers.bash b/test/system/libs/helpers.bash
index b264d7216..36c81af15 100644
--- a/test/system/libs/helpers.bash
+++ b/test/system/libs/helpers.bash
@@ -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() {