diff --git a/example.test.env.yaml b/example.test.env.yaml index b01eebd..0a5ea63 100644 --- a/example.test.env.yaml +++ b/example.test.env.yaml @@ -46,7 +46,9 @@ replace_registry: # Config of the instance tested to alter package names. alter_package_name: # namespace in which package names should be altered - namespace: integration-tests + namespace: integration-tests-with-suffix + # oauth token for integration-tests-with-suffix namespace + quay_oauth_token: # robot account credentials with access to the namespace user: password: @@ -54,6 +56,8 @@ alter_package_name: suffix: "-test-suffix" # name of the package used for testing package: int-test + csv_annotations: + test: "package.{package_name}" # Config of the instance tested to check if Greenwave policies are met for the # NVR greenwave: diff --git a/tests/integration/alter_package_names/alter_package_names_test.py b/tests/integration/alter_package_names/alter_package_names_test.py index 98627a8..12f8200 100644 --- a/tests/integration/alter_package_names/alter_package_names_test.py +++ b/tests/integration/alter_package_names/alter_package_names_test.py @@ -11,6 +11,23 @@ from tests.integration.utils import test_env, make_bundle, is_yaml_file +def _test_csv_annotations(quay_bundle, config): + """ + Test if bundle contains configured annotations. + Package name must contain suffix. + """ + + package_name = config["package"] + config["suffix"] + + substitutions = { + 'package_name': package_name, + } + + for name, value in config['csv_annotations'].items(): + assert name in quay_bundle['metadata']['annotations'] + assert quay_bundle['metadata']['annotations'][name] == value.format(**substitutions) + + def has(suffix, manifest_path): """ Tell if 'suffix' can be found in YAML files under 'manifest_path'. @@ -66,6 +83,7 @@ def test_alter_package_name_during_nvr_push(suffix_omps, suffix_quay, koji, tmp_ ) assert quay_bundle["packageName"] == config["package"] + config["suffix"] + _test_csv_annotations(quay_bundle, config) @pytest.mark.skipif( @@ -103,5 +121,5 @@ def test_alter_package_name_during_archive_push(suffix_omps, suffix_quay, tmp_pa ) ) ) - assert quay_bundle["packageName"] == config["package"] + config["suffix"] + _test_csv_annotations(quay_bundle, config) diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 23709a0..413c837 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -80,7 +80,7 @@ def suffix_quay(): if config: quay = QuayAppRegistry(test_env["quay_app_registry_api"], test_env["quay_api"], - test_env["quay_oauth_token"]) + config["quay_oauth_token"]) quay.login_to_cnr(config["user"], config["password"])