Skip to content

Commit

Permalink
Use the old pulp-ci-centos:https image with updated service files
Browse files Browse the repository at this point in the history
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 pulp/pulpcore@4def68e#diff-15df6aebb457ef62acf7707d2032bf15dc24646d040d1bf2f892929263ce570dR16

ref pulp/pulp-oci-images#540

[noissue]

(cherry picked from commit abdcf7c)
  • Loading branch information
lubosmj committed Oct 31, 2023
1 parent c150af5 commit 49cc438
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
14 changes: 12 additions & 2 deletions pulp_container/tests/functional/api/test_pulpimportexport.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def test_import_export_standard(
importers_pulp_api_client,
importers_pulp_imports_api_client,
gen_object_with_cleanup,
has_pulp_plugin,
):
"""Test exporting and importing of a container repository."""
remote = container_remote_api.create(gen_container_remote())
Expand Down Expand Up @@ -63,7 +64,11 @@ 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")]
if has_pulp_plugin("core", min="3.36.0"):
filenames = [f for f in list(export.output_file_info.keys()) if f.endswith(".tar")]
else:
filenames = [f for f in list(export.output_file_info.keys()) if f.endswith("tar.gz")]

import_response = importers_pulp_imports_api_client.create(
importer.pulp_href, {"path": filenames[0]}
)
Expand Down Expand Up @@ -99,6 +104,7 @@ def test_import_export_create_repositories(
importers_pulp_api_client,
importers_pulp_imports_api_client,
gen_object_with_cleanup,
has_pulp_plugin,
):
"""Test importing of a push repository without creating an initial repository manually."""
if registry_client.name != "podman":
Expand Down Expand Up @@ -128,7 +134,11 @@ 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")]

if has_pulp_plugin("core", min="3.36.0"):
filenames = [f for f in list(export.output_file_info.keys()) if f.endswith(".tar")]
else:
filenames = [f for f in list(export.output_file_info.keys()) if f.endswith("tar.gz")]

import_response = importers_pulp_imports_api_client.create(
importer.pulp_href, {"path": filenames[0], "create_repositories": True}
Expand Down

0 comments on commit 49cc438

Please sign in to comment.