From 6ca9ef9344bbf2b6c999762225071cba3a535d5f Mon Sep 17 00:00:00 2001 From: Lubos Mjachky Date: Fri, 8 Sep 2023 17:22:46 +0200 Subject: [PATCH] Use the old pulp-ci-centos:https image with updated service files This is a temporary workaround that makes the CI green once again. The referenced image uses the pulp-ci-centos:https base image. On top of it, there are layers that contain updated service files which allows us to properly run pulpcore-api and pulpcore-content services. We will revert the commit once we will be able to resolve the execution of nested containers. ref https://github.com/pulp/pulpcore/commit/4def68e1f1bd4ffcae5352ee9d6ff7404759a19e#diff-15df6aebb457ef62acf7707d2032bf15dc24646d040d1bf2f892929263ce570dR16 ref https://github.com/pulp/pulp-oci-images/issues/540 [noissue] (cherry picked from commit abdcf7c7c7d9422e2591d622cc65932227d22b8b) --- .github/workflows/scripts/install.sh | 2 +- .../tests/functional/api/test_pulpimportexport.py | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index c89132bd8..3c9588132 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -71,7 +71,7 @@ cat >> vars/main.yaml << VARSYAML pulp_settings: {"allowed_content_checksums": ["sha1", "sha224", "sha256", "sha384", "sha512"], "allowed_export_paths": ["/tmp"], "allowed_import_paths": ["/tmp"]} pulp_scheme: https -pulp_container_tag: https +pulp_container_tag: https-pulp_container-ci VARSYAML diff --git a/pulp_container/tests/functional/api/test_pulpimportexport.py b/pulp_container/tests/functional/api/test_pulpimportexport.py index 61be26ca6..dc1dcb81d 100644 --- a/pulp_container/tests/functional/api/test_pulpimportexport.py +++ b/pulp_container/tests/functional/api/test_pulpimportexport.py @@ -63,7 +63,10 @@ def test_import_export_standard( } importer = gen_object_with_cleanup(importers_pulp_api_client, body) - filenames = [f for f in list(export.output_file_info.keys()) if f.endswith("tar.gz")] + filenames = [ + f + for f in list(export.output_file_info.keys()) if f.endswith("tar.gz") or f.endswith(".tar") + ] import_response = importers_pulp_imports_api_client.create( importer.pulp_href, {"path": filenames[0]} ) @@ -128,7 +131,10 @@ def test_import_export_create_repositories( body = {"name": str(uuid.uuid4())} importer = gen_object_with_cleanup(importers_pulp_api_client, body) - filenames = [f for f in list(export.output_file_info.keys()) if f.endswith("tar.gz")] + filenames = [ + f + for f in list(export.output_file_info.keys()) if f.endswith("tar.gz") or f.endswith(".tar") + ] import_response = importers_pulp_imports_api_client.create( importer.pulp_href, {"path": filenames[0], "create_repositories": True}