summaryrefslogtreecommitdiff
path: root/smoketest/scripts/cli/test_container.py
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-02-09 07:31:40 +0100
committerChristian Breunig <christian@breunig.cc>2023-02-09 07:31:40 +0100
commitf234b602c4b0554456c494451b438d32f3386d69 (patch)
treef6d1cd575a2533ec9e890ed0ad48740a38f9bf88 /smoketest/scripts/cli/test_container.py
parent10ab68a018dd137ee9a6350c131f65ec6e12e446 (diff)
downloadvyos-1x-f234b602c4b0554456c494451b438d32f3386d69.tar.gz
vyos-1x-f234b602c4b0554456c494451b438d32f3386d69.zip
Revert "container: T4959: Add container registry authentication config for containers"
This reverts commit b17251334c57c2f6875c19ad4e6c6127aa9e1811.
Diffstat (limited to 'smoketest/scripts/cli/test_container.py')
-rwxr-xr-xsmoketest/scripts/cli/test_container.py23
1 files changed, 0 insertions, 23 deletions
diff --git a/smoketest/scripts/cli/test_container.py b/smoketest/scripts/cli/test_container.py
index ecf912872..902156ee6 100755
--- a/smoketest/scripts/cli/test_container.py
+++ b/smoketest/scripts/cli/test_container.py
@@ -14,7 +14,6 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import re
import unittest
import glob
import json
@@ -32,7 +31,6 @@ prefix = '192.168.205.0/24'
net_name = 'NET01'
PROCESS_NAME = 'conmon'
PROCESS_PIDFILE = '/run/vyos-container-{0}.service.pid'
-config_containers_registry = '/etc/containers/registries.conf'
busybox_image_path = '/usr/share/vyos/busybox-stable.tar'
@@ -112,26 +110,5 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
self.assertEqual(json_subnet, prefix)
self.assertEqual(json_ip, cont_ip)
- def test_03_container_registry(self):
- def extract_rendered_registry(text_to_find):
- registry_pattern = re.compile(r'^unqualified-search-registries = (\[.*\])', re.M)
- return re.findall(registry_pattern, text_to_find)
-
- with open(config_containers_registry, 'r') as f:
- registry_conf_content = f.read()
-
- expected_default_render_registry = json.dumps(['docker.io', 'quay.io'])
- default_rendered_registry = extract_rendered_registry(registry_conf_content)
- self.assertNotEqual(0, len(default_rendered_registry))
- self.assertEqual(expected_default_render_registry, default_rendered_registry[-1])
-
- self.cli_set(base_path + ['registry', 'docker.io'])
- self.cli_set(base_path + ['registry', 'example.com'])
- self.cli_commit()
- expected_render_registry = json.dumps(['docker.io', 'quay.io', 'example.com'])
- rendered_registry = extract_rendered_registry(registry_conf_content)
- self.assertNotEqual(0, len(rendered_registry))
- self.assertEqual(expected_render_registry, rendered_registry[-1])
-
if __name__ == '__main__':
unittest.main(verbosity=2)