diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a178e81aa..0c47db40b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -115,5 +115,5 @@ jobs: PULP_ENABLED_PLUGINS: "${{ matrix.pulp_enabled_plugins }}" OAS_VERSION: "${{ matrix.oas_version }}" run: | - .ci/run_container.sh make livetest + .ci/run_container.sh make paralleltest ... diff --git a/Makefile b/Makefile index ddd4fa460..dabaa547b 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,9 @@ test: | tests/cli.toml livetest: | tests/cli.toml python3 -m pytest -v tests pulp-glue/tests -m live +paralleltest: | tests/cli.toml + python3 -m pytest -v tests pulp-glue/tests -m live -n 8 + unittest: python3 -m pytest -v tests pulp-glue/tests cookiecutter/pulp_filter_extension.py -m "not live" diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml index 1d0586da2..31a10eb63 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/.github/workflows/test.yml @@ -87,5 +87,5 @@ jobs: OAS_VERSION: "${{ matrix.oas_version }}" {%- endraw %} run: | - .ci/run_container.sh make {% if cookiecutter.unittests %}live{% endif %}test + .ci/run_container.sh make {% if cookiecutter.unittests %}parallel{% endif %}test ... diff --git a/cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile b/cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile index 28c3304ef..cff721f2c 100644 --- a/cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile +++ b/cookiecutter/ci/{{ cookiecutter.__project_name }}/Makefile @@ -60,6 +60,9 @@ test: | tests/cli.toml livetest: | tests/cli.toml python3 -m pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %} -m live +paralleltest: | tests/cli.toml + python3 -m pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %} -m live -n 8 + unittest: python3 -m pytest -v tests {%- if cookiecutter.glue %} pulp-glue{{ cookiecutter.__app_label_suffix }}/tests {%- endif %} {%- if cookiecutter.__app_label_suffix == "" %} cookiecutter/pulp_filter_extension.py {%- endif %} -m "not live" diff --git a/pulpcore/cli/container/distribution.py b/pulpcore/cli/container/distribution.py index 0130077aa..46bebd2ad 100644 --- a/pulpcore/cli/container/distribution.py +++ b/pulpcore/cli/container/distribution.py @@ -4,6 +4,7 @@ from pulp_glue.common.context import ( EntityDefinition, EntityFieldDefinition, + PluginRequirement, PulpEntityContext, PulpRepositoryContext, ) @@ -114,6 +115,10 @@ def update( distribution: EntityDefinition = distribution_ctx.entity body: EntityDefinition = {} + non_blocking = not ( + base_path is not None + or distribution_ctx.pulp_ctx.has_plugin(PluginRequirement("core", specifier="<3.24.0")) + ) if private is not None: body["private"] = private @@ -134,16 +139,18 @@ def update( repository = t.cast(PulpEntityContext, repository) if version is not None: if distribution["repository"]: - distribution_ctx.update(body={"repository": ""}, non_blocking=True) + distribution_ctx.update(body={"repository": ""}, non_blocking=non_blocking) body["repository_version"] = f"{repository.pulp_href}versions/{version}/" else: if distribution["repository_version"]: - distribution_ctx.update(body={"repository_version": ""}, non_blocking=True) + distribution_ctx.update( + body={"repository_version": ""}, non_blocking=non_blocking + ) body["repository"] = repository.pulp_href elif version is not None: # keep current repository, change version if distribution["repository"]: - distribution_ctx.update(body={"repository": ""}, non_blocking=True) + distribution_ctx.update(body={"repository": ""}, non_blocking=non_blocking) body["repository_version"] = f'{distribution["repository"]}versions/{version}/' elif distribution["repository_version"]: # 'dummy' vars are to get us around a mypy/1.2 complaint about '_' diff --git a/pulpcore/cli/core/task.py b/pulpcore/cli/core/task.py index 0a9686d54..23c8863b4 100644 --- a/pulpcore/cli/core/task.py +++ b/pulpcore/cli/core/task.py @@ -153,6 +153,10 @@ def cancel( states.append("running") if states: tasks = task_ctx.list(limit=1 << 64, offset=0, parameters={"state__in": states}) + if pulp_ctx.api._dry_run: + raise click.ClickException( + _("Trying to cancel {} tasks in safe-mode, aborting").format(len(tasks)) + ) for task in tasks: task_ctx.cancel(task["pulp_href"], background=True) for task in tasks: diff --git a/test_requirements.txt b/test_requirements.txt index 85e523210..3b6c5bd1e 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -1,5 +1,6 @@ # Test requirements pytest>=7.0.0,<8.5 +pytest-xdist pytest-subtests>=0.12.0,<0.15 python-gnupg>=0.5.0,<0.6 trustme>=1.1.0,<1.3 diff --git a/tests/conftest.py b/tests/conftest.py index a18fe3018..788fe99c7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,6 +14,7 @@ def pulp_cli_vars(pulp_cli_vars: t.Dict[str, str]) -> t.Dict[str, str]: result.update( { "FILE_REMOTE_URL": urljoin(PULP_FIXTURES_URL, "/file/PULP_MANIFEST"), + "FILE_REMOTE2_URL": urljoin(PULP_FIXTURES_URL, "/file2/PULP_MANIFEST"), "FILE_LARGE_REMOTE_URL": urljoin(PULP_FIXTURES_URL, "/file-perf/PULP_MANIFEST"), "CONTAINER_REMOTE_URL": "https://quay.io", "CONTAINER_IMAGE": "libpod/alpine", diff --git a/tests/scripts/pulp_ansible/test_content.sh b/tests/scripts/pulp_ansible/test_content.sh index 9b3103ffc..a404d18c0 100755 --- a/tests/scripts/pulp_ansible/test_content.sh +++ b/tests/scripts/pulp_ansible/test_content.sh @@ -7,35 +7,34 @@ set -eu pulp debug has-plugin --name "ansible" || exit 23 cleanup() { - pulp ansible repository destroy --name "cli_test_ansible_repository" || true - pulp ansible repository destroy --name "cli_test_ansible_repository_verify" || true - pulp ansible repository destroy --name "cli_test_ansible_repository_upload" || true + pulp ansible repository destroy --name "cli_test_ansible_content_repository" || true + pulp ansible repository destroy --name "cli_test_ansible_content_repository_verify" || true + pulp ansible repository destroy --name "cli_test_ansible_content_repository_upload" || true } trap cleanup EXIT -pulp orphan cleanup --protection-time 0 if pulp debug has-plugin --name "ansible" --specifier ">=0.15.0" then gpg --output pulp_pubkey.key --armor --export "pulp-fixture-signing-key" - expect_succ pulp ansible repository create --name "cli_test_ansible_repository_verify" --gpgkey @pulp_pubkey.key + expect_succ pulp ansible repository create --name "cli_test_ansible_content_repository_verify" --gpgkey @pulp_pubkey.key else - expect_succ pulp ansible repository create --name "cli_test_ansible_repository_verify" + expect_succ pulp ansible repository create --name "cli_test_ansible_content_repository_verify" fi # Test ansible collection-version upload wget "https://galaxy.ansible.com/download/ansible-posix-1.3.0.tar.gz" sha256=$(sha256sum ansible-posix-1.3.0.tar.gz | cut -d' ' -f1) -expect_succ pulp ansible repository create --name "cli_test_ansible_repository_upload" -expect_succ pulp ansible content upload --file "ansible-posix-1.3.0.tar.gz" --repository "cli_test_ansible_repository_upload" +expect_succ pulp ansible repository create --name "cli_test_ansible_content_repository_upload" +expect_succ pulp ansible content upload --file "ansible-posix-1.3.0.tar.gz" --repository "cli_test_ansible_content_repository_upload" expect_succ pulp artifact list --sha256 "$sha256" test "$(echo "$OUTPUT" | jq -r length)" -eq "1" expect_succ pulp ansible content list --name "posix" --namespace "ansible" --version "1.3.0" test "$(echo "$OUTPUT" | jq -r length)" -eq "1" content_href="$(echo "$OUTPUT" | jq -r .[0].pulp_href)" expect_succ pulp ansible content show --href "$content_href" -expect_succ pulp ansible repository content list --repository "cli_test_ansible_repository_upload" --version 1 +expect_succ pulp ansible repository content list --repository "cli_test_ansible_content_repository_upload" --version 1 test "$(echo "$OUTPUT" | jq -r length)" -eq "1" # Test ansible role upload @@ -57,7 +56,7 @@ then tar --extract --file="ansible-posix-1.3.0.tar.gz" "MANIFEST.json" collection_path="$(realpath 'MANIFEST.json')" signature_path="$("$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")"/assets/sign_detached.sh "$collection_path" | jq -r .signature)" - expect_succ pulp ansible content --type "signature" upload --file "$signature_path" --collection "$content_href" --repository "cli_test_ansible_repository_verify" + expect_succ pulp ansible content --type "signature" upload --file "$signature_path" --collection "$content_href" --repository "cli_test_ansible_content_repository_verify" expect_succ pulp ansible content --type "signature" list --collection "$content_href" --pubkey-fingerprint "0C1A894EBB86AFAE218424CADDEF3019C2D4A8CF" test "$(echo "$OUTPUT" | jq -r length)" -eq "1" content3_href="$(echo "$OUTPUT" | jq -r .[0].pulp_href)" @@ -65,21 +64,21 @@ then fi # New content commands -expect_succ pulp ansible repository create --name "cli_test_ansible_repository" -expect_succ pulp ansible repository content add --repository "cli_test_ansible_repository" --name "posix" --namespace "ansible" --version "1.3.0" -expect_succ pulp ansible repository content list --repository "cli_test_ansible_repository" --version 1 +expect_succ pulp ansible repository create --name "cli_test_ansible_content_repository" +expect_succ pulp ansible repository content add --repository "cli_test_ansible_content_repository" --name "posix" --namespace "ansible" --version "1.3.0" +expect_succ pulp ansible repository content list --repository "cli_test_ansible_content_repository" --version 1 test "$(echo "$OUTPUT" | jq -r length)" -eq "1" -expect_succ pulp ansible repository content --type "role" add --repository "cli_test_ansible_repository" --name "kubernetes-modules" --namespace "ansible" --version "0.0.1" -expect_succ pulp ansible repository content --type "role" list --repository "cli_test_ansible_repository" --version 2 +expect_succ pulp ansible repository content --type "role" add --repository "cli_test_ansible_content_repository" --name "kubernetes-modules" --namespace "ansible" --version "0.0.1" +expect_succ pulp ansible repository content --type "role" list --repository "cli_test_ansible_content_repository" --version 2 test "$(echo "$OUTPUT" | jq -r length)" -eq "1" if pulp debug has-plugin --name "core" --specifier ">=3.11.0" then - expect_succ pulp ansible repository content list --repository "cli_test_ansible_repository" --version 2 --all-types + expect_succ pulp ansible repository content list --repository "cli_test_ansible_content_repository" --version 2 --all-types test "$(echo "$OUTPUT" | jq -r length)" -eq "2" fi -expect_succ pulp ansible repository content remove --repository "cli_test_ansible_repository" --href "$content_href" -expect_succ pulp ansible repository content remove --repository "cli_test_ansible_repository" --href "$content2_href" -expect_succ pulp ansible repository content list --repository "cli_test_ansible_repository" +expect_succ pulp ansible repository content remove --repository "cli_test_ansible_content_repository" --href "$content_href" +expect_succ pulp ansible repository content remove --repository "cli_test_ansible_content_repository" --href "$content2_href" +expect_succ pulp ansible repository content list --repository "cli_test_ansible_content_repository" test "$(echo "$OUTPUT" | jq -r length)" -eq "0" diff --git a/tests/scripts/pulp_ansible/test_distribution.sh b/tests/scripts/pulp_ansible/test_distribution.sh index 067f48808..60b837795 100755 --- a/tests/scripts/pulp_ansible/test_distribution.sh +++ b/tests/scripts/pulp_ansible/test_distribution.sh @@ -7,21 +7,21 @@ set -eu pulp debug has-plugin --name "ansible" || exit 23 cleanup() { - pulp ansible repository destroy --name "cli_test_ansible_repository" || true + pulp ansible repository destroy --name "cli_test_ansible_distribution_repository" || true pulp ansible distribution destroy --name "cli_test_ansible_distro" || true pulp ansible distribution destroy --name "cli_test_ansible_ver_distro" || true } trap cleanup EXIT -expect_succ pulp ansible repository create --name "cli_test_ansible_repository" +expect_succ pulp ansible repository create --name "cli_test_ansible_distribution_repository" expect_succ pulp ansible distribution create --name "cli_test_ansible_distro" \ --base-path "cli_test_ansible_distro" \ - --repository "cli_test_ansible_repository" + --repository "cli_test_ansible_distribution_repository" expect_succ pulp ansible distribution create --name "cli_test_ansible_ver_distro" \ --base-path "cli_test_ansible_ver_distro" \ - --repository "cli_test_ansible_repository" \ + --repository "cli_test_ansible_distribution_repository" \ --version "0" expect_succ pulp ansible distribution list diff --git a/tests/scripts/pulp_ansible/test_sign.sh b/tests/scripts/pulp_ansible/test_sign.sh index 2bbd66f0c..26419626a 100755 --- a/tests/scripts/pulp_ansible/test_sign.sh +++ b/tests/scripts/pulp_ansible/test_sign.sh @@ -8,25 +8,24 @@ pulp debug has-plugin --name "ansible" --specifier ">=0.12.0" || exit 23 [ "$(pulp signing-service list --name "sign_ansible" | jq 'length')" = "1" ] || exit 23 cleanup() { - pulp ansible remote -t "collection" destroy --name "cli_test_ansible_collection_remote" || true - pulp ansible repository destroy --name "cli_test_ansible_repository" || true - pulp orphan cleanup || true + pulp ansible remote -t "collection" destroy --name "cli_test_ansible_sign_remote" || true + pulp ansible repository destroy --name "cli_test_ansible_sign_repository" || true } trap cleanup EXIT # Prepare -expect_succ pulp ansible remote -t "collection" create --name "cli_test_ansible_collection_remote" \ +expect_succ pulp ansible remote -t "collection" create --name "cli_test_ansible_sign_remote" \ --url "$ANSIBLE_COLLECTION_REMOTE_URL" --requirements "collections: - robertdebock.ansible_development_environment" -expect_succ pulp ansible repository create --name "cli_test_ansible_repository" +expect_succ pulp ansible repository create --name "cli_test_ansible_sign_repository" HREF="$(echo "$OUTPUT" | jq -r '.pulp_href')" -expect_succ pulp ansible repository sync --repository "cli_test_ansible_repository" --remote "cli_test_ansible_collection_remote" +expect_succ pulp ansible repository sync --repository "cli_test_ansible_sign_repository" --remote "cli_test_ansible_sign_remote" # Test sign -expect_succ pulp ansible repository sign --repository "cli_test_ansible_repository" --signing-service "sign_ansible" +expect_succ pulp ansible repository sign --repository "cli_test_ansible_sign_repository" --signing-service "sign_ansible" # Verify sign expect_succ pulp ansible repository version list --repository "$HREF" test "$(echo "$OUTPUT" | jq -r length)" -eq 3 -expect_succ pulp ansible repository version show --repository "cli_test_ansible_repository" --version 2 +expect_succ pulp ansible repository version show --repository "cli_test_ansible_sign_repository" --version 2 test "$(echo "$OUTPUT" | jq -r '.content_summary.present."ansible.collection_signature".count')" -gt 0 diff --git a/tests/scripts/pulp_ansible/test_sync.sh b/tests/scripts/pulp_ansible/test_sync.sh index a09c2d1a3..23d89bf6a 100755 --- a/tests/scripts/pulp_ansible/test_sync.sh +++ b/tests/scripts/pulp_ansible/test_sync.sh @@ -7,57 +7,56 @@ set -eu pulp debug has-plugin --name "ansible" || exit 23 cleanup() { - pulp ansible remote -t "role" destroy --name "cli_test_ansible_remote" || true - pulp ansible remote -t "collection" destroy --name "cli_test_ansible_collection_remote" || true - pulp ansible repository destroy --name "cli_test_ansible_repository" || true - pulp orphan cleanup || true + pulp ansible remote -t "role" destroy --name "cli_test_ansible_sync_role_remote" || true + pulp ansible remote -t "collection" destroy --name "cli_test_ansible_sync_remote" || true + pulp ansible repository destroy --name "cli_test_ansible_sync_repository" || true } trap cleanup EXIT cleanup # Prepare -expect_succ pulp ansible remote -t "role" create --name "cli_test_ansible_remote" --url "$ANSIBLE_ROLE_REMOTE_URL" -expect_succ pulp ansible remote -t "collection" create --name "cli_test_ansible_collection_remote" \ +expect_succ pulp ansible remote -t "role" create --name "cli_test_ansible_sync_role_remote" --url "$ANSIBLE_ROLE_REMOTE_URL" +expect_succ pulp ansible remote -t "collection" create --name "cli_test_ansible_sync_remote" \ --url "$ANSIBLE_COLLECTION_REMOTE_URL" --requirements "collections: - robertdebock.ansible_development_environment" -expect_succ pulp ansible repository create --name "cli_test_ansible_repository" +expect_succ pulp ansible repository create --name "cli_test_ansible_sync_repository" # Test without remote (should fail) -expect_fail pulp ansible repository sync --repository "cli_test_ansible_repository" +expect_fail pulp ansible repository sync --repository "cli_test_ansible_sync_repository" # Test with remote -expect_succ pulp ansible repository sync --repository "cli_test_ansible_repository" --remote "role:cli_test_ansible_remote" +expect_succ pulp ansible repository sync --repository "cli_test_ansible_sync_repository" --remote "role:cli_test_ansible_sync_role_remote" # Preconfigure remote -expect_succ pulp ansible repository update --repository "cli_test_ansible_repository" --remote "role:cli_test_ansible_remote" +expect_succ pulp ansible repository update --repository "cli_test_ansible_sync_repository" --remote "role:cli_test_ansible_sync_role_remote" # Test with remote -expect_succ pulp ansible repository sync --repository "cli_test_ansible_repository" +expect_succ pulp ansible repository sync --repository "cli_test_ansible_sync_repository" # Test without remote -expect_succ pulp ansible repository sync --repository "cli_test_ansible_repository" --remote "role:cli_test_ansible_remote" +expect_succ pulp ansible repository sync --repository "cli_test_ansible_sync_repository" --remote "role:cli_test_ansible_sync_role_remote" # Verify sync -expect_succ pulp ansible repository version list --repository "cli_test_ansible_repository" +expect_succ pulp ansible repository version list --repository "cli_test_ansible_sync_repository" test "$(echo "$OUTPUT" | jq -r length)" -eq 2 -expect_succ pulp ansible repository version show --repository "cli_test_ansible_repository" --version 1 +expect_succ pulp ansible repository version show --repository "cli_test_ansible_sync_repository" --version 1 test "$(echo "$OUTPUT" | jq -r '.content_summary.present."ansible.role".count')" -gt 0 expect_succ pulp ansible content --type role list test "$(echo "$OUTPUT" | jq -r length)" -gt 0 # Test repair the version -expect_succ pulp ansible repository version repair --repository "cli_test_ansible_repository" --version 1 +expect_succ pulp ansible repository version repair --repository "cli_test_ansible_sync_repository" --version 1 test "$(echo "$OUTPUT" | jq -r '.state')" = "completed" # Delete version again -expect_succ pulp ansible repository version destroy --repository "cli_test_ansible_repository" --version 1 +expect_succ pulp ansible repository version destroy --repository "cli_test_ansible_sync_repository" --version 1 # Test with collection remote -expect_succ pulp ansible repository sync --name "cli_test_ansible_repository" --remote "cli_test_ansible_collection_remote" +expect_succ pulp ansible repository sync --name "cli_test_ansible_sync_repository" --remote "cli_test_ansible_sync_remote" # Verify sync -expect_succ pulp ansible repository version list --repository "cli_test_ansible_repository" +expect_succ pulp ansible repository version list --repository "cli_test_ansible_sync_repository" test "$(echo "$OUTPUT" | jq -r length)" -eq 2 -expect_succ pulp ansible repository version show --repository "cli_test_ansible_repository" --version 2 +expect_succ pulp ansible repository version show --repository "cli_test_ansible_sync_repository" --version 2 test "$(echo "$OUTPUT" | jq -r '.content_summary.present."ansible.collection_version".count')" -gt 0 expect_succ pulp ansible content list test "$(echo "$OUTPUT" | jq -r length)" -gt 0 diff --git a/tests/scripts/pulp_container/test_content.sh b/tests/scripts/pulp_container/test_content.sh index 429ee40a8..6e39cd17b 100755 --- a/tests/scripts/pulp_container/test_content.sh +++ b/tests/scripts/pulp_container/test_content.sh @@ -7,16 +7,15 @@ set -eu pulp debug has-plugin --name "container" || exit 23 cleanup() { - pulp container repository destroy --name "cli_test_container_repository" || true - pulp container remote destroy --name "cli_test_container_remote" || true - pulp orphan cleanup || true + pulp container repository destroy --name "cli_test_container_content_repository" || true + pulp container remote destroy --name "cli_test_container_content_remote" || true } trap cleanup EXIT # Prepare -pulp container remote create --name "cli_test_container_remote" --url "$CONTAINER_REMOTE_URL" --upstream-name "$CONTAINER_IMAGE" -pulp container repository create --name "cli_test_container_repository" -pulp container repository sync --name "cli_test_container_repository" --remote "cli_test_container_remote" +pulp container remote create --name "cli_test_container_content_remote" --url "$CONTAINER_REMOTE_URL" --upstream-name "$CONTAINER_IMAGE" +pulp container repository create --name "cli_test_container_content_repository" +pulp container repository sync --name "cli_test_container_content_repository" --remote "cli_test_container_content_remote" # Check each content list expect_succ pulp container content -t blob list @@ -48,15 +47,15 @@ expect_succ pulp container content -t tag show --name "$tag_name" --digest "$tag test "$(echo "$OUTPUT" | jq -r .pulp_href)" = "$tag_href" # Test repository content commands -expect_succ pulp container repository content list --repository "cli_test_container_repository" --all-types -expect_succ pulp container repository content --type "tag" list --repository "cli_test_container_repository" -expect_succ pulp container repository content --type "manifest" list --repository "cli_test_container_repository" -expect_succ pulp container repository content --type "blob" list --repository "cli_test_container_repository" - -expect_succ pulp container repository content --type "blob" remove --repository "cli_test_container_repository" --digest "$blob_digest" -expect_succ pulp container repository content --type "manifest" remove --repository "cli_test_container_repository" --digest "$manifest_digest" -expect_succ pulp container repository content --type "tag" remove --repository "cli_test_container_repository" --name "$tag_name" --digest "$tag_digest" - -expect_succ pulp container repository content add --repository "cli_test_container_repository" --href "$blob_href" -expect_succ pulp container repository content add --repository "cli_test_container_repository" --href "$manifest_href" -expect_succ pulp container repository content add --repository "cli_test_container_repository" --href "$tag_href" +expect_succ pulp container repository content list --repository "cli_test_container_content_repository" --all-types +expect_succ pulp container repository content --type "tag" list --repository "cli_test_container_content_repository" +expect_succ pulp container repository content --type "manifest" list --repository "cli_test_container_content_repository" +expect_succ pulp container repository content --type "blob" list --repository "cli_test_container_content_repository" + +expect_succ pulp container repository content --type "blob" remove --repository "cli_test_container_content_repository" --digest "$blob_digest" +expect_succ pulp container repository content --type "manifest" remove --repository "cli_test_container_content_repository" --digest "$manifest_digest" +expect_succ pulp container repository content --type "tag" remove --repository "cli_test_container_content_repository" --name "$tag_name" --digest "$tag_digest" + +expect_succ pulp container repository content add --repository "cli_test_container_content_repository" --href "$blob_href" +expect_succ pulp container repository content add --repository "cli_test_container_content_repository" --href "$manifest_href" +expect_succ pulp container repository content add --repository "cli_test_container_content_repository" --href "$tag_href" diff --git a/tests/scripts/pulp_container/test_copy.sh b/tests/scripts/pulp_container/test_copy.sh index a32173bad..7bff414a0 100755 --- a/tests/scripts/pulp_container/test_copy.sh +++ b/tests/scripts/pulp_container/test_copy.sh @@ -9,18 +9,17 @@ pulp debug has-plugin --name "container" || exit 23 cleanup() { pulp container repository destroy --name "cli_test_source_container_repository" || true pulp container repository destroy --name "cli_test_dest_container_repository" || true - pulp container remote destroy --name "cli_test_container_remote" || true - pulp orphan cleanup || true + pulp container remote destroy --name "cli_test_container_copy_remote" || true } trap cleanup EXIT # Prepare -expect_succ pulp container remote create --name "cli_test_container_remote" --url "$CONTAINER_REMOTE_URL" --upstream-name "$CONTAINER_IMAGE" +expect_succ pulp container remote create --name "cli_test_container_copy_remote" --url "$CONTAINER_REMOTE_URL" --upstream-name "$CONTAINER_IMAGE" SOURCE_HREF="$(pulp container repository create --name "cli_test_source_container_repository" | jq -r '.pulp_href')" expect_succ pulp container repository create --name "cli_test_dest_container_repository" HREF="$(echo "$OUTPUT" | jq -r '.pulp_href')" -expect_succ pulp container repository sync --repository "cli_test_source_container_repository" --remote "cli_test_container_remote" +expect_succ pulp container repository sync --repository "cli_test_source_container_repository" --remote "cli_test_container_copy_remote" TAG="$(pulp container repository content -t "tag" list --repository "cli_test_source_container_repository" | jq -r '.[0].name')" DIGEST="$(pulp container repository content -t "manifest" list --repository "cli_test_source_container_repository" | jq -r '.[] | select(.listed_manifests == []) | .digest' | sed -n '1p')" diff --git a/tests/scripts/pulp_container/test_distribution.sh b/tests/scripts/pulp_container/test_distribution.sh index ff22ff821..7e2eb8128 100755 --- a/tests/scripts/pulp_container/test_distribution.sh +++ b/tests/scripts/pulp_container/test_distribution.sh @@ -7,21 +7,21 @@ set -eu pulp debug has-plugin --name "container" || exit 23 cleanup() { - pulp container repository destroy --name "cli_test_container_repository" || true + pulp container repository destroy --name "cli_test_container_distribution_repository" || true pulp container distribution destroy --name "cli_test_container_distro" || true pulp container distribution destroy --name "cli_test_container_distro_ver" || true } trap cleanup EXIT -expect_succ pulp container repository create --name "cli_test_container_repository" +expect_succ pulp container repository create --name "cli_test_container_distribution_repository" expect_succ pulp container distribution create --name "cli_test_container_distro" \ --base-path "cli_test_container_distro" \ - --repository "cli_test_container_repository" + --repository "cli_test_container_distribution_repository" expect_succ pulp container distribution create --name "cli_test_container_distro_ver" \ --base-path "cli_test_container_distro_ver" \ - --repository "cli_test_container_repository" \ + --repository "cli_test_container_distribution_repository" \ --version 0 expect_succ pulp container distribution list @@ -33,7 +33,7 @@ if pulp debug has-plugin --name "container" --specifier ">=2.10.0" then expect_succ pulp container distribution update --distribution "cli_test_container_distro" --version 0 expect_succ pulp container distribution update --distribution "cli_test_container_distro" --repository "" - expect_succ pulp container distribution update --distribution "cli_test_container_distro_ver" --repository "cli_test_container_repository" + expect_succ pulp container distribution update --distribution "cli_test_container_distro_ver" --repository "cli_test_container_distribution_repository" expect_succ pulp container distribution update --distribution "cli_test_container_distro_ver" --repository "" fi expect_succ pulp container distribution destroy --distribution "cli_test_container_distro" diff --git a/tests/scripts/pulp_container/test_role.sh b/tests/scripts/pulp_container/test_role.sh index c790650df..981c3f432 100755 --- a/tests/scripts/pulp_container/test_role.sh +++ b/tests/scripts/pulp_container/test_role.sh @@ -9,27 +9,27 @@ pulp debug has-plugin --name "container" --specifier ">=2.11.0" || exit 23 USERPASS="Yeech6ba" cleanup() { - pulp group destroy --name "clitest" || true - pulp user destroy --username "clitest" || true - pulp container repository destroy --name "clitest" || true + pulp group destroy --name "container-role-clitest" || true + pulp user destroy --username "container-role-clitest" || true + pulp container repository destroy --name "container-role-clitest" || true } trap cleanup EXIT -expect_succ pulp user create --username "clitest" --password "${USERPASS}" -expect_succ pulp group create --name "clitest" -expect_succ pulp group user add --group "clitest" --username "clitest" +expect_succ pulp user create --username "container-role-clitest" --password "${USERPASS}" +expect_succ pulp group create --name "container-role-clitest" +expect_succ pulp group user add --group "container-role-clitest" --username "container-role-clitest" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" container repository list +expect_succ pulp -p noauth --username container-role-clitest --password "${USERPASS}" container repository list test "$(echo "${OUTPUT}" | jq -r 'length' )" = "0" -expect_deny pulp -p noauth --username clitest --password "${USERPASS}" container repository create --name "clitest" -expect_succ pulp container repository create --name "clitest" +expect_deny pulp -p noauth --username container-role-clitest --password "${USERPASS}" container repository create --name "container-role-clitest" +expect_succ pulp container repository create --name "container-role-clitest" REPOSITORY_HREF=$(jq -r '.pulp_href' <<<"${OUTPUT}") -expect_fail pulp -p noauth --username clitest --password "${USERPASS}" container repository show --repository "clitest" -expect_fail pulp -p noauth --username clitest --password "${USERPASS}" container repository show --repository "${REPOSITORY_HREF}" +expect_fail pulp -p noauth --username container-role-clitest --password "${USERPASS}" container repository show --repository "container-role-clitest" +expect_fail pulp -p noauth --username container-role-clitest --password "${USERPASS}" container repository show --repository "${REPOSITORY_HREF}" -expect_succ pulp container repository role add --name "clitest" --user "clitest" --role "container.containerrepository_viewer" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" container repository show --repository "clitest" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" container repository show --repository "${REPOSITORY_HREF}" +expect_succ pulp container repository role add --name "container-role-clitest" --user "container-role-clitest" --role "container.containerrepository_viewer" +expect_succ pulp -p noauth --username container-role-clitest --password "${USERPASS}" container repository show --repository "container-role-clitest" +expect_succ pulp -p noauth --username container-role-clitest --password "${USERPASS}" container repository show --repository "${REPOSITORY_HREF}" -expect_deny pulp -p noauth --username clitest --password "${USERPASS}" container repository update --href "${REPOSITORY_HREF}" --retain-repo-versions 1 +expect_deny pulp -p noauth --username container-role-clitest --password "${USERPASS}" container repository update --href "${REPOSITORY_HREF}" --retain-repo-versions 1 diff --git a/tests/scripts/pulp_container/test_sync.sh b/tests/scripts/pulp_container/test_sync.sh index 28a8ade82..b7f5713c2 100755 --- a/tests/scripts/pulp_container/test_sync.sh +++ b/tests/scripts/pulp_container/test_sync.sh @@ -7,34 +7,34 @@ set -eu pulp debug has-plugin --name "container" || exit 23 cleanup() { - pulp container repository destroy --name "cli_test_container_repository" || true - pulp container remote destroy --name "cli_test_container_remote" || true + pulp container repository destroy --name "cli_test_container_sync_repository" || true + pulp container remote destroy --name "cli_test_container_sync_remote" || true } trap cleanup EXIT # Prepare -pulp container remote create --name "cli_test_container_remote" --url "$CONTAINER_REMOTE_URL" --upstream-name "$CONTAINER_IMAGE" -pulp container repository create --name "cli_test_container_repository" +pulp container remote create --name "cli_test_container_sync_remote" --url "$CONTAINER_REMOTE_URL" --upstream-name "$CONTAINER_IMAGE" +pulp container repository create --name "cli_test_container_sync_repository" # Test without remote (should fail) -expect_fail pulp container repository sync --repository "cli_test_container_repository" +expect_fail pulp container repository sync --repository "cli_test_container_sync_repository" # Test with remote -expect_succ pulp container repository sync --repository "cli_test_container_repository" --remote "cli_test_container_remote" +expect_succ pulp container repository sync --repository "cli_test_container_sync_repository" --remote "cli_test_container_sync_remote" # Preconfigure remote # TBD -# pulp container repository update --name "cli_test_container_repository" --remote "cli_test_container_remote" +# pulp container repository update --name "cli_test_container_sync_repository" --remote "cli_test_container_sync_remote" # Test with remote -# expect_succ pulp container repository sync --name "cli_test_container_repository" +# expect_succ pulp container repository sync --name "cli_test_container_sync_repository" # Test without remote -# expect_succ pulp container repository sync --name "cli_test_container_repository" --remote "cli_test_container_remote" +# expect_succ pulp container repository sync --name "cli_test_container_sync_repository" --remote "cli_test_container_sync_remote" # Verify sync -expect_succ pulp container repository version list --repository "cli_test_container_repository" +expect_succ pulp container repository version list --repository "cli_test_container_sync_repository" test "$(echo "$OUTPUT" | jq -r length)" -eq 2 -expect_succ pulp container repository version show --repository "cli_test_container_repository" --version 1 +expect_succ pulp container repository version show --repository "cli_test_container_sync_repository" --version 1 test "$(echo "$OUTPUT" | jq -r '.content_summary.present."container.tag".count')" -gt 0 # Delete version again -expect_succ pulp container repository version destroy --repository "cli_test_container_repository" --version 1 +expect_succ pulp container repository version destroy --repository "cli_test_container_sync_repository" --version 1 diff --git a/tests/scripts/pulp_container/test_tag.sh b/tests/scripts/pulp_container/test_tag.sh index 06e4f9bbf..19ab26bfa 100755 --- a/tests/scripts/pulp_container/test_tag.sh +++ b/tests/scripts/pulp_container/test_tag.sh @@ -7,22 +7,21 @@ set -eu pulp debug has-plugin --name "container" || exit 23 cleanup() { - pulp container repository destroy --name "cli_test_container_repository" || true - pulp container remote destroy --name "cli_test_container_remote" || true - pulp orphan cleanup || true + pulp container repository destroy --name "cli_test_container_tag_repository" || true + pulp container remote destroy --name "cli_test_container_tag_remote" || true } trap cleanup EXIT # Prepare -pulp container remote create --name "cli_test_container_remote" --url "$CONTAINER_REMOTE_URL" --upstream-name "$CONTAINER_IMAGE" -pulp container repository create --name "cli_test_container_repository" -pulp container repository sync --repository "cli_test_container_repository" --remote "cli_test_container_remote" +pulp container remote create --name "cli_test_container_tag_remote" --url "$CONTAINER_REMOTE_URL" --upstream-name "$CONTAINER_IMAGE" +pulp container repository create --name "cli_test_container_tag_repository" +pulp container repository sync --repository "cli_test_container_tag_repository" --remote "cli_test_container_tag_remote" manifest_digest="$(pulp container content -t manifest list | tr '\r\n' ' ' | jq -r .[0].digest)" -expect_succ pulp container repository tag --repository "cli_test_container_repository" --tag "test_tag" --digest "$manifest_digest" -expect_succ pulp container repository version show --repository "cli_test_container_repository" --version "2" +expect_succ pulp container repository tag --repository "cli_test_container_tag_repository" --tag "test_tag" --digest "$manifest_digest" +expect_succ pulp container repository version show --repository "cli_test_container_tag_repository" --version "2" test "$(echo "$OUTPUT" | jq -r '.content_summary.added["container.tag"].count')" -eq "1" -expect_succ pulp container repository untag --repository "cli_test_container_repository" --tag "test_tag" -expect_succ pulp container repository version show --repository "cli_test_container_repository" --version "3" +expect_succ pulp container repository untag --repository "cli_test_container_tag_repository" --tag "test_tag" +expect_succ pulp container repository version show --repository "cli_test_container_tag_repository" --version "3" test "$(echo "$OUTPUT" | jq -r '.content_summary.removed["container.tag"].count')" -eq "1" diff --git a/tests/scripts/pulp_file/test_acs.sh b/tests/scripts/pulp_file/test_acs.sh index 8fb333033..00d0ebc61 100755 --- a/tests/scripts/pulp_file/test_acs.sh +++ b/tests/scripts/pulp_file/test_acs.sh @@ -11,9 +11,9 @@ acs="cli_test_acs" cleanup() { pulp file acs destroy --name $acs || true - pulp file repository destroy --name "cli-repo-manifest-only" || true + pulp file repository destroy --name "cli-file-repo-manifest-only" || true pulp file remote destroy --name $acs_remote || true - pulp file remote destroy --name "cli-remote-manifest-only" || true + pulp file remote destroy --name "cli-file-remote-manifest-only" || true } trap cleanup EXIT @@ -49,10 +49,10 @@ expect_succ pulp task-group show --uuid "$group_task_uuid" test "$(echo "$OUTPUT" | jq ".tasks | length")" -eq 2 # create a remote with manifest only and sync it -expect_succ pulp file remote create --name "cli-remote-manifest-only" --url "$PULP_FIXTURES_URL/file-manifest/PULP_MANIFEST" +expect_succ pulp file remote create --name "cli-file-remote-manifest-only" --url "$PULP_FIXTURES_URL/file-manifest/PULP_MANIFEST" remote_href="$(echo "$OUTPUT" | jq -r '.pulp_href')" -expect_succ pulp file repository create --name "cli-repo-manifest-only" --remote "$remote_href" -expect_succ pulp file repository sync --repository "cli-repo-manifest-only" +expect_succ pulp file repository create --name "cli-file-repo-manifest-only" --remote "$remote_href" +expect_succ pulp file repository sync --repository "cli-file-repo-manifest-only" # test refresh with bad paths expect_succ pulp file acs path add --name $acs --path "bad-path/PULP_MANIFEST" diff --git a/tests/scripts/pulp_file/test_content.sh b/tests/scripts/pulp_file/test_content.sh index e01a1582c..93f42c98e 100755 --- a/tests/scripts/pulp_file/test_content.sh +++ b/tests/scripts/pulp_file/test_content.sh @@ -7,9 +7,8 @@ set -eu pulp debug has-plugin --name "file" || exit 23 cleanup() { - pulp file repository destroy --name "cli_test_file_repository" || true - pulp file repository destroy --name "cli_test_file_repository_2" || true - pulp orphan cleanup || true + pulp file repository destroy --name "cli_test_file_content_repository" || true + pulp file repository destroy --name "cli_test_file_content_repository_2" || true } trap cleanup EXIT @@ -44,22 +43,22 @@ then expect_succ pulp file content create --file-url "$FILE_REMOTE_URL" --relative-path PULP_MANIFEST fi -expect_succ pulp file repository create --name "cli_test_file_repository" +expect_succ pulp file repository create --name "cli_test_file_content_repository" # New content commands -expect_succ pulp file repository content add --repository "cli_test_file_repository" --sha256 "$sha256" --relative-path upload_test/test.txt -expect_succ pulp file repository content add --repository "cli_test_file_repository" --sha256 "$sha256" --relative-path upload_test/test.txt --base-version 0 -expect_succ pulp file repository content list --repository "cli_test_file_repository" --version 1 +expect_succ pulp file repository content add --repository "cli_test_file_content_repository" --sha256 "$sha256" --relative-path upload_test/test.txt +expect_succ pulp file repository content add --repository "cli_test_file_content_repository" --sha256 "$sha256" --relative-path upload_test/test.txt --base-version 0 +expect_succ pulp file repository content list --repository "cli_test_file_content_repository" --version 1 test "$(echo "$OUTPUT" | jq -r length)" -eq "1" -expect_succ pulp file repository content list --repository "cli_test_file_repository" --all-types +expect_succ pulp file repository content list --repository "cli_test_file_content_repository" --all-types -expect_succ pulp file repository content remove --repository "cli_test_file_repository" --sha256 "$sha256" --relative-path upload_test/test.txt -expect_succ pulp file repository content list --repository "cli_test_file_repository" +expect_succ pulp file repository content remove --repository "cli_test_file_content_repository" --sha256 "$sha256" --relative-path upload_test/test.txt +expect_succ pulp file repository content list --repository "cli_test_file_content_repository" test "$(echo "$OUTPUT" | jq -r length)" -eq "0" # Create and add to repository in one command -expect_succ pulp file content create --sha256 "$sha256" --relative-path upload_test/test2.txt --repository "cli_test_file_repository" -expect_succ pulp file content upload --file test.txt --relative-path upload_test/test3.txt --repository "cli_test_file_repository" -expect_succ pulp file repository content list --repository "cli_test_file_repository" +expect_succ pulp file content create --sha256 "$sha256" --relative-path upload_test/test2.txt --repository "cli_test_file_content_repository" +expect_succ pulp file content upload --file test.txt --relative-path upload_test/test3.txt --repository "cli_test_file_content_repository" +expect_succ pulp file repository content list --repository "cli_test_file_content_repository" test "$(echo "$OUTPUT" | jq -r '[.[]|.relative_path]|sort|join(" ")')" = "upload_test/test2.txt upload_test/test3.txt" expect_succ pulp content list @@ -70,5 +69,5 @@ expect_succ pulp repository version list --content "[]" expect_succ pulp repository version list --content "$(jq -R '[.]' <<<"$content_href")" # Creating a new repository version from a different repository -expect_succ pulp file repository create --name "cli_test_file_repository_2" -expect_succ pulp file repository content modify --repository "cli_test_file_repository_2" --base-repository "cli_test_file_repository" +expect_succ pulp file repository create --name "cli_test_file_content_repository_2" +expect_succ pulp file repository content modify --repository "cli_test_file_content_repository_2" --base-repository "cli_test_file_content_repository" diff --git a/tests/scripts/pulp_file/test_content_bulk.sh b/tests/scripts/pulp_file/test_content_bulk.sh index 0f1e496cd..fe87e540c 100755 --- a/tests/scripts/pulp_file/test_content_bulk.sh +++ b/tests/scripts/pulp_file/test_content_bulk.sh @@ -7,8 +7,7 @@ set -eu pulp debug has-plugin --name "file" || exit 23 cleanup() { - pulp file repository destroy --name "cli_test_file_repository" || true - pulp orphan cleanup || true + pulp file repository destroy --name "cli_test_file_content_bulk_repository" || true } trap cleanup EXIT @@ -27,18 +26,18 @@ expect_succ pulp file content create --sha256 "$sha256_1" --relative-path upload expect_succ pulp file content create --sha256 "$sha256_2" --relative-path upload_test/test_2.txt expect_succ pulp file content create --sha256 "$sha256_3" --relative-path upload_test/test_3.txt -expect_succ pulp file repository create --name "cli_test_file_repository" +expect_succ pulp file repository create --name "cli_test_file_content_bulk_repository" # Test invalid json input -expect_fail pulp file repository content modify --repository "cli_test_file_repository" --add-content "{\"sha256\":\"$sha256_1\",\"relative_path\":\"upload_test/test_1.txt\"}" +expect_fail pulp file repository content modify --repository "cli_test_file_content_bulk_repository" --add-content "{\"sha256\":\"$sha256_1\",\"relative_path\":\"upload_test/test_1.txt\"}" echo "${ERROUTPUT}" | grep -q "should be instance of 'list'" -expect_fail pulp file repository content modify --repository "cli_test_file_repository" --add-content "[{\"relative_path\":\"upload_test/test_1.txt\"}]" +expect_fail pulp file repository content modify --repository "cli_test_file_content_bulk_repository" --add-content "[{\"relative_path\":\"upload_test/test_1.txt\"}]" echo "${ERROUTPUT}" | grep -q "Missing key: 'sha256'" -expect_fail pulp file repository content modify --repository "cli_test_file_repository" --add-content "[{\"sha256\":\"$sha256_1\",\"relative_path\":\"upload_test/test_1.txt\", \"sha128\":\"abcd\"}]" +expect_fail pulp file repository content modify --repository "cli_test_file_content_bulk_repository" --add-content "[{\"sha256\":\"$sha256_1\",\"relative_path\":\"upload_test/test_1.txt\", \"sha128\":\"abcd\"}]" echo "${ERROUTPUT}" | grep -q "Wrong key 'sha128' in" -expect_fail pulp file repository content modify --repository "cli_test_file_repository" --add-content "[{\"sha256\":1234567890,\"relative_path\":\"upload_test/test_1.txt\"}]" +expect_fail pulp file repository content modify --repository "cli_test_file_content_bulk_repository" --add-content "[{\"sha256\":1234567890,\"relative_path\":\"upload_test/test_1.txt\"}]" echo "${ERROUTPUT}" | grep -q "should be instance of 'str'" -expect_fail pulp file repository content modify --repository "cli_test_file_repository" --add-content "[{\"sha256\":\"$sha256_1\",\"relative_path\":\"\"}]" +expect_fail pulp file repository content modify --repository "cli_test_file_content_bulk_repository" --add-content "[{\"sha256\":\"$sha256_1\",\"relative_path\":\"\"}]" echo "${ERROUTPUT}" | grep -q "Key 'relative_path' error:" # Add content using JSON file @@ -61,9 +60,9 @@ EOT cp add_content.json remove_content.json # New Content commands -expect_succ pulp file repository content modify --repository "cli_test_file_repository" --add-content "[{\"sha256\":\"$sha256_1\",\"relative_path\":\"upload_test/test_1.txt\"},{\"sha256\":\"$sha256_2\",\"relative_path\":\"upload_test/test_2.txt\"},{\"sha256\":\"$sha256_3\",\"relative_path\":\"upload_test/test_3.txt\"}]" -expect_succ pulp file repository content list --repository "cli_test_file_repository" +expect_succ pulp file repository content modify --repository "cli_test_file_content_bulk_repository" --add-content "[{\"sha256\":\"$sha256_1\",\"relative_path\":\"upload_test/test_1.txt\"},{\"sha256\":\"$sha256_2\",\"relative_path\":\"upload_test/test_2.txt\"},{\"sha256\":\"$sha256_3\",\"relative_path\":\"upload_test/test_3.txt\"}]" +expect_succ pulp file repository content list --repository "cli_test_file_content_bulk_repository" test "$(echo "$OUTPUT" | jq -r length)" -eq "3" -expect_succ pulp file repository content modify --repository "cli_test_file_repository" --remove-content "@remove_content.json" -expect_succ pulp file repository content list --repository "cli_test_file_repository" +expect_succ pulp file repository content modify --repository "cli_test_file_content_bulk_repository" --remove-content "@remove_content.json" +expect_succ pulp file repository content list --repository "cli_test_file_content_bulk_repository" test "$(echo "$OUTPUT" | jq -r length)" -eq "0" diff --git a/tests/scripts/pulp_file/test_distribution.sh b/tests/scripts/pulp_file/test_distribution.sh index 88f5c5402..e1fe3bc2e 100755 --- a/tests/scripts/pulp_file/test_distribution.sh +++ b/tests/scripts/pulp_file/test_distribution.sh @@ -7,24 +7,24 @@ set -eu pulp debug has-plugin --name "file" || exit 23 cleanup() { - pulp file repository destroy --name "cli_test_file_repository" || true - pulp file remote destroy --name "cli_test_file_remote" || true + pulp file repository destroy --name "cli_test_file_distribution_repository" || true + pulp file remote destroy --name "cli_test_file_distribution_remote" || true pulp file distribution destroy --name "cli_test_file_distro" || true pulp content-guard rbac destroy --name "cli_test_file_content_guard" || true } trap cleanup EXIT -expect_succ pulp file remote create --name "cli_test_file_remote" --url "$FILE_REMOTE_URL" -expect_succ pulp file repository create --name "cli_test_file_repository" --remote "cli_test_file_remote" -expect_succ pulp file repository sync --repository "cli_test_file_repository" -expect_succ pulp file publication create --repository "cli_test_file_repository" +expect_succ pulp file remote create --name "cli_test_file_distribution_remote" --url "$FILE_REMOTE_URL" +expect_succ pulp file repository create --name "cli_test_file_distribution_repository" --remote "cli_test_file_distribution_remote" +expect_succ pulp file repository sync --repository "cli_test_file_distribution_repository" +expect_succ pulp file publication create --repository "cli_test_file_distribution_repository" PUBLICATION_HREF=$(echo "$OUTPUT" | jq -r .pulp_href) expect_succ pulp content-guard rbac create --name "cli_test_file_content_guard" CONTENT_GUARD_HREF=$(echo "$OUTPUT" | jq -r .pulp_href) expect_succ pulp file distribution create \ --name "cli_test_file_distro" \ - --base-path "wrong_path" \ + --base-path "file_wrong_path" \ --publication "$PUBLICATION_HREF" \ --content-guard "core:rbac:cli_test_file_content_guard" expect_succ pulp file distribution update \ @@ -42,7 +42,7 @@ if pulp debug has-plugin --name "file" --specifier ">=1.7.0" then expect_succ pulp file distribution update \ --distribution "cli_test_file_distro" \ - --repository "cli_test_file_repository" + --repository "cli_test_file_distribution_repository" fi expect_succ pulp file distribution list --base-path "cli_test_file_distro" diff --git a/tests/scripts/pulp_file/test_label.sh b/tests/scripts/pulp_file/test_label.sh index 965006f48..d4120b1a5 100755 --- a/tests/scripts/pulp_file/test_label.sh +++ b/tests/scripts/pulp_file/test_label.sh @@ -7,11 +7,11 @@ set -eu pulp debug has-plugin --name "file" --specifier ">=1.6.0" || exit 23 cleanup() { - pulp file repository destroy --name "cli_test_file_repo" || true + pulp file repository destroy --name "cli_test_file_label_repo" || true } trap cleanup EXIT -name="cli_test_file_repo" +name="cli_test_file_label_repo" expect_succ pulp file repository create --name "$name" --labels '{"atani": "hurin"}' expect_succ pulp file repository label set --repository "$name" --key "ainur" --value "ulmo" diff --git a/tests/scripts/pulp_file/test_prn.sh b/tests/scripts/pulp_file/test_prn.sh index d6ec60ea3..4d0d5cd41 100755 --- a/tests/scripts/pulp_file/test_prn.sh +++ b/tests/scripts/pulp_file/test_prn.sh @@ -8,18 +8,18 @@ pulp debug has-plugin --name "core" --specifier ">=3.63.0" || exit 23 pulp debug has-plugin --name "file" || exit 23 cleanup() { - pulp file distribution destroy --name "cli_test_file_distribution" || true - pulp file repository destroy --name "cli_test_file_repository" || true - pulp file remote destroy --name "cli_test_file_remote" || true + pulp file distribution destroy --name "cli_test_file_prn_distribution" || true + pulp file repository destroy --name "cli_test_file_prn_repository" || true + pulp file remote destroy --name "cli_test_file_prn_remote" || true } trap cleanup EXIT cleanup # Prepare -expect_succ pulp file remote create --name "cli_test_file_remote" --url "$FILE_REMOTE_URL" +expect_succ pulp file remote create --name "cli_test_file_prn_remote" --url "$FILE_REMOTE_URL" remote_prn=$(echo "${OUTPUT}" | jq -r .prn) -expect_succ pulp file repository create --name "cli_test_file_repository" +expect_succ pulp file repository create --name "cli_test_file_prn_repository" repository_prn=$(echo "${OUTPUT}" | jq -r .prn) # Test show-by-PRN @@ -48,7 +48,7 @@ expect_succ pulp file publication create --repository "${repository_prn}" publication_prn=$(echo "${OUTPUT}" | jq -r .prn) # Test distribution -expect_succ pulp file distribution create --name "cli_test_file_distribution" --base-path "cli_test_file_distribution" --publication "${publication_prn}" +expect_succ pulp file distribution create --name "cli_test_file_prn_distribution" --base-path "cli_test_file_prn_distribution" --publication "${publication_prn}" # Test looking up "hrefs" using prn: # (Note: this only works when we have the context and prn__in=[] is supported diff --git a/tests/scripts/pulp_file/test_publication.sh b/tests/scripts/pulp_file/test_publication.sh index eb9e8d352..3fe693bd8 100755 --- a/tests/scripts/pulp_file/test_publication.sh +++ b/tests/scripts/pulp_file/test_publication.sh @@ -7,26 +7,26 @@ set -eu pulp debug has-plugin --name "file" || exit 23 cleanup() { - pulp file repository destroy --name "cli_test_file_repository" || true - pulp file remote destroy --name "cli_test_file_remote" || true + pulp file repository destroy --name "cli_test_file_publication_repository" || true + pulp file remote destroy --name "cli_test_file_publication_remote" || true } trap cleanup EXIT -pulp file remote create --name "cli_test_file_remote" --url "$FILE_REMOTE_URL" -pulp file repository create --name "cli_test_file_repository" --remote "cli_test_file_remote" -pulp file repository sync --name "cli_test_file_repository" +pulp file remote create --name "cli_test_file_publication_remote" --url "$FILE_REMOTE_URL" +pulp file repository create --name "cli_test_file_publication_repository" --remote "cli_test_file_publication_remote" +pulp file repository sync --name "cli_test_file_publication_repository" -expect_succ pulp file publication create --repository "cli_test_file_repository" +expect_succ pulp file publication create --repository "cli_test_file_publication_repository" PUBLICATION_HREF="$(echo "$OUTPUT" | jq -r .pulp_href)" expect_succ pulp file publication destroy --href "$PUBLICATION_HREF" -expect_succ pulp file publication create --repository "cli_test_file_repository" --version 0 +expect_succ pulp file publication create --repository "cli_test_file_publication_repository" --version 0 PUBLICATION_HREF="$(echo "$OUTPUT" | jq -r .pulp_href)" if pulp debug has-plugin --name "core" --specifier ">=3.20.0" then - expect_succ pulp file publication list --repository "cli_test_file_repository" + expect_succ pulp file publication list --repository "cli_test_file_publication_repository" test "$(echo "$OUTPUT" | jq -r length)" -eq 1 - expect_succ pulp publication list --repository "file:file:cli_test_file_repository" + expect_succ pulp publication list --repository "file:file:cli_test_file_publication_repository" test "$(echo "$OUTPUT" | jq -r length)" -eq 1 fi expect_succ pulp file publication destroy --href "$PUBLICATION_HREF" diff --git a/tests/scripts/pulp_file/test_repository.sh b/tests/scripts/pulp_file/test_repository.sh index 150f2b5c7..4a72cf0c4 100755 --- a/tests/scripts/pulp_file/test_repository.sh +++ b/tests/scripts/pulp_file/test_repository.sh @@ -59,9 +59,9 @@ test "$(echo "$OUTPUT" | jq -r '.|length')" != "0" expect_succ pulp repository list --name "cli_test_file_repo" test "$(echo "$OUTPUT" | jq -r '.|length')" = "1" expect_succ pulp repository list --name-contains "cli_test_file" -test "$(echo "$OUTPUT" | jq -r '.|length')" = "1" +test "$(echo "$OUTPUT" | jq -r '.|length')" -ge "1" expect_succ pulp repository list --name-icontains "CLI_test_file" -test "$(echo "$OUTPUT" | jq -r '.|length')" = "1" +test "$(echo "$OUTPUT" | jq -r '.|length')" -ge "1" expect_succ pulp repository list --name-in "cli_test_file_repo" test "$(echo "$OUTPUT" | jq -r '.|length')" = "1" diff --git a/tests/scripts/pulp_file/test_role.sh b/tests/scripts/pulp_file/test_role.sh index c305bccfc..d5b8c7769 100755 --- a/tests/scripts/pulp_file/test_role.sh +++ b/tests/scripts/pulp_file/test_role.sh @@ -9,28 +9,28 @@ pulp debug has-plugin --name "file" --specifier ">=1.11.0" || exit 23 USERPASS="Yeech6ba" cleanup() { - pulp user destroy --username "clitest" || true - pulp file repository destroy --name "clitest" || true + pulp user destroy --username "file-role-clitest" || true + pulp file repository destroy --name "file-role-clitest" || true } trap cleanup EXIT -pulp user create --username "clitest" --password "${USERPASS}" +pulp user create --username "file-role-clitest" --password "${USERPASS}" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" file repository list +expect_succ pulp -p noauth --username file-role-clitest --password "${USERPASS}" file repository list test "$(echo "${OUTPUT}" | jq -r 'length' )" = "0" -expect_deny pulp -p noauth --username clitest --password "${USERPASS}" file repository create --name "clitest" -expect_succ pulp file repository create --name "clitest" +expect_deny pulp -p noauth --username file-role-clitest --password "${USERPASS}" file repository create --name "file-role-clitest" +expect_succ pulp file repository create --name "file-role-clitest" REPOSITORY_HREF=$(jq -r '.pulp_href' <<<"${OUTPUT}") -expect_fail pulp -p noauth --username clitest --password "${USERPASS}" file repository show --repository "clitest" -expect_fail pulp -p noauth --username clitest --password "${USERPASS}" file repository show --href "${REPOSITORY_HREF}" +expect_fail pulp -p noauth --username file-role-clitest --password "${USERPASS}" file repository show --repository "file-role-clitest" +expect_fail pulp -p noauth --username file-role-clitest --password "${USERPASS}" file repository show --href "${REPOSITORY_HREF}" -expect_succ pulp file repository role add --repository "clitest" --user "clitest" --role "file.filerepository_viewer" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" file repository show --repository "clitest" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" file repository show --href "${REPOSITORY_HREF}" +expect_succ pulp file repository role add --repository "file-role-clitest" --user "file-role-clitest" --role "file.filerepository_viewer" +expect_succ pulp -p noauth --username file-role-clitest --password "${USERPASS}" file repository show --repository "file-role-clitest" +expect_succ pulp -p noauth --username file-role-clitest --password "${USERPASS}" file repository show --href "${REPOSITORY_HREF}" -expect_deny pulp -p noauth --username clitest --password "${USERPASS}" file repository update --repository "${REPOSITORY_HREF}" --retain-repo-versions 1 +expect_deny pulp -p noauth --username file-role-clitest --password "${USERPASS}" file repository update --repository "${REPOSITORY_HREF}" --retain-repo-versions 1 -expect_succ pulp file repository role remove --name "clitest" --user "clitest" --role "file.filerepository_viewer" -expect_fail pulp -p noauth --username clitest --password "${USERPASS}" file repository show --repository "clitest" -expect_fail pulp -p noauth --username clitest --password "${USERPASS}" file repository show --repository "${REPOSITORY_HREF}" +expect_succ pulp file repository role remove --name "file-role-clitest" --user "file-role-clitest" --role "file.filerepository_viewer" +expect_fail pulp -p noauth --username file-role-clitest --password "${USERPASS}" file repository show --repository "file-role-clitest" +expect_fail pulp -p noauth --username file-role-clitest --password "${USERPASS}" file repository show --repository "${REPOSITORY_HREF}" diff --git a/tests/scripts/pulp_file/test_sync.sh b/tests/scripts/pulp_file/test_sync.sh index 8f55c5f90..75538414f 100755 --- a/tests/scripts/pulp_file/test_sync.sh +++ b/tests/scripts/pulp_file/test_sync.sh @@ -6,58 +6,58 @@ set -eu pulp debug has-plugin --name "file" || exit 23 -autopublish_repo="cli_test_file_repository_autopublish" +autopublish_repo="cli_test_file_sync_repository_autopublish" one_version_repo="cli_test_one_version_repo" cleanup() { - pulp file repository destroy --name "cli_test_file_repository" || true + pulp file repository destroy --name "cli_test_file_sync_repository" || true pulp file repository destroy --name "$autopublish_repo" || true pulp file repository destroy --name "$one_version_repo" || true - pulp file remote destroy --name "cli_test_file_remote" || true + pulp file remote destroy --name "cli_test_file_sync_remote" || true } trap cleanup EXIT cleanup # Prepare -expect_succ pulp file remote create --name "cli_test_file_remote" --url "$FILE_REMOTE_URL" -expect_succ pulp file repository create --name "cli_test_file_repository" +expect_succ pulp file remote create --name "cli_test_file_sync_remote" --url "$FILE_REMOTE_URL" +expect_succ pulp file repository create --name "cli_test_file_sync_repository" # Test without remote (should fail) -expect_fail pulp file repository sync --repository "cli_test_file_repository" +expect_fail pulp file repository sync --repository "cli_test_file_sync_repository" # Test with remote -expect_succ pulp file repository sync --repository "cli_test_file_repository" --remote "cli_test_file_remote" +expect_succ pulp file repository sync --repository "cli_test_file_sync_repository" --remote "cli_test_file_sync_remote" # Preconfigure remote -expect_succ pulp file repository update --repository "cli_test_file_repository" --remote "cli_test_file_remote" +expect_succ pulp file repository update --repository "cli_test_file_sync_repository" --remote "cli_test_file_sync_remote" # Test with remote -expect_succ pulp file repository sync --repository "cli_test_file_repository" +expect_succ pulp file repository sync --repository "cli_test_file_sync_repository" # Test without remote -expect_succ pulp file repository sync --repository "cli_test_file_repository" --remote "cli_test_file_remote" +expect_succ pulp file repository sync --repository "cli_test_file_sync_repository" --remote "cli_test_file_sync_remote" # Verify sync -expect_succ pulp file repository version list --repository "cli_test_file_repository" +expect_succ pulp file repository version list --repository "cli_test_file_sync_repository" test "$(echo "$OUTPUT" | jq -r length)" -eq 2 -expect_succ pulp file repository version show --repository "cli_test_file_repository" --version 1 +expect_succ pulp file repository version show --repository "cli_test_file_sync_repository" --version 1 test "$(echo "$OUTPUT" | jq -r '.content_summary.present."file.file".count')" -eq 3 # Test repair the version -expect_succ pulp file repository version repair --repository "cli_test_file_repository" --version 1 +expect_succ pulp file repository version repair --repository "cli_test_file_sync_repository" --version 1 test "$(echo "$OUTPUT" | jq -r '.state')" = "completed" # Delete version again -expect_succ pulp file repository version destroy --version 1 --repository "cli_test_file_repository" +expect_succ pulp file repository version destroy --version 1 --repository "cli_test_file_sync_repository" # Test autopublish -expect_succ pulp file repository create --name "$autopublish_repo" --remote "cli_test_file_remote" --autopublish +expect_succ pulp file repository create --name "$autopublish_repo" --remote "cli_test_file_sync_remote" --autopublish expect_succ pulp file repository sync --repository "$autopublish_repo" task=$(echo "$ERROUTPUT" | grep -E -o "${PULP_API_ROOT}([-_a-zA-Z0-9]+/)?api/v3/tasks/[-[:xdigit:]]*/") created_resources=$(pulp show --href "$task" | jq -r ".created_resources") echo "$created_resources" | grep -q -E "${PULP_API_ROOT}([-_a-zA-Z0-9]+/)?api/v3/publications/file/file/" # Test retained versions -expect_succ pulp file repository create --name "$one_version_repo" --remote "cli_test_file_remote" --retain-repo-versions 1 +expect_succ pulp file repository create --name "$one_version_repo" --remote "cli_test_file_sync_remote" --retain-repo-versions 1 expect_succ pulp file repository sync --repository "$one_version_repo" expect_succ pulp file repository version list --repository "$one_version_repo" test "$(echo "$OUTPUT" | jq -r length)" -eq 1 diff --git a/tests/scripts/pulp_python/test_content.sh b/tests/scripts/pulp_python/test_content.sh index d9d31b00c..7d93ff44c 100755 --- a/tests/scripts/pulp_python/test_content.sh +++ b/tests/scripts/pulp_python/test_content.sh @@ -8,9 +8,8 @@ pulp debug has-plugin --name "python" || exit 23 cleanup() { rm "shelf-reader-0.1.tar.gz" - pulp python repository destroy --name "cli_test_python_repository" || true + pulp python repository destroy --name "cli_test_python_content_repository" || true pulp python repository destroy --name "cli_test_python_upload_repository" || true - pulp orphan cleanup --protection-time 0 || true } trap cleanup EXIT @@ -31,9 +30,9 @@ then expect_succ pulp python content create --file-url "$file_url" --relative-path "shelf-reader-0.1.tar.gz" fi -expect_succ pulp python repository create --name "cli_test_python_repository" +expect_succ pulp python repository create --name "cli_test_python_content_repository" HREF="$(echo "$OUTPUT" | jq -r '.pulp_href')" -expect_succ pulp python repository content add --repository "cli_test_python_repository" --sha256 "$sha256" --filename "shelf-reader-0.1.tar.gz" +expect_succ pulp python repository content add --repository "cli_test_python_content_repository" --sha256 "$sha256" --filename "shelf-reader-0.1.tar.gz" expect_succ pulp python repository content add --repository "$HREF" --sha256 "$sha256" --filename "shelf-reader-0.1.tar.gz" --base-version 0 -expect_succ pulp python repository content remove --repository "cli_test_python_repository" --sha256 "$sha256" --filename "shelf-reader-0.1.tar.gz" +expect_succ pulp python repository content remove --repository "cli_test_python_content_repository" --sha256 "$sha256" --filename "shelf-reader-0.1.tar.gz" expect_succ pulp python repository content remove --repository "$HREF" --sha256 "$sha256" --filename "shelf-reader-0.1.tar.gz" --base-version 1 diff --git a/tests/scripts/pulp_python/test_distribution.sh b/tests/scripts/pulp_python/test_distribution.sh index ae81a0cc6..69695d080 100755 --- a/tests/scripts/pulp_python/test_distribution.sh +++ b/tests/scripts/pulp_python/test_distribution.sh @@ -7,22 +7,21 @@ set -eu pulp debug has-plugin --name "python" || exit 23 cleanup() { - pulp python repository destroy --name "cli_test_python_repository" || true - pulp python remote destroy --name "cli_test_python_remote" || true + pulp python repository destroy --name "cli_test_python_distribution_repository" || true + pulp python remote destroy --name "cli_test_python_distribution_remote" || true pulp python distribution destroy --name "cli_test_python_distro" || true - pulp orphan cleanup || true } trap cleanup EXIT -expect_succ pulp python remote create --name "cli_test_python_remote" --url "$PYTHON_REMOTE_URL" --includes '["shelf-reader"]' -expect_succ pulp python repository create --name "cli_test_python_repository" --remote "cli_test_python_remote" -expect_succ pulp python repository sync --repository "cli_test_python_repository" -expect_succ pulp python publication create --repository "cli_test_python_repository" +expect_succ pulp python remote create --name "cli_test_python_distribution_remote" --url "$PYTHON_REMOTE_URL" --includes '["shelf-reader"]' +expect_succ pulp python repository create --name "cli_test_python_distribution_repository" --remote "cli_test_python_distribution_remote" +expect_succ pulp python repository sync --repository "cli_test_python_distribution_repository" +expect_succ pulp python publication create --repository "cli_test_python_distribution_repository" PUBLICATION_HREF=$(echo "$OUTPUT" | jq -r .pulp_href) expect_succ pulp python distribution create \ --name "cli_test_python_distro" \ - --base-path "wrong_path" \ + --base-path "python_wrong_path" \ --publication "$PUBLICATION_HREF" HREF="$(echo "$OUTPUT" | jq -r '.pulp_href')" expect_succ pulp python distribution update \ @@ -35,11 +34,11 @@ expect_succ pulp python distribution update \ expect_succ pulp python distribution update \ --name "cli_test_python_distro" \ ---repository "cli_test_python_repository" \ +--repository "cli_test_python_distribution_repository" \ --block-uploads expect_succ pulp python distribution update \ --name "cli_test_python_distro" \ ---remote "cli_test_python_remote" +--remote "cli_test_python_distribution_remote" expect_succ pulp python distribution destroy --distribution "cli_test_python_distro" diff --git a/tests/scripts/pulp_python/test_publication.sh b/tests/scripts/pulp_python/test_publication.sh index 1e6f813d6..788e0a712 100755 --- a/tests/scripts/pulp_python/test_publication.sh +++ b/tests/scripts/pulp_python/test_publication.sh @@ -7,19 +7,18 @@ set -eu pulp debug has-plugin --name "python" || exit 23 cleanup() { - pulp python repository destroy --name "cli_test_python_repository" || true - pulp python remote destroy --name "cli_test_python_remote" || true - pulp orphan cleanup || true + pulp python repository destroy --name "cli_test_python_publication_repository" || true + pulp python remote destroy --name "cli_test_python_publication_remote" || true } trap cleanup EXIT -pulp python remote create --name "cli_test_python_remote" --url "$PYTHON_REMOTE_URL" -pulp python repository create --name "cli_test_python_repository" --remote "cli_test_python_remote" -pulp python repository sync --repository "cli_test_python_repository" +pulp python remote create --name "cli_test_python_publication_remote" --url "$PYTHON_REMOTE_URL" +pulp python repository create --name "cli_test_python_publication_repository" --remote "cli_test_python_publication_remote" +pulp python repository sync --repository "cli_test_python_publication_repository" -expect_succ pulp python publication create --repository "cli_test_python_repository" +expect_succ pulp python publication create --repository "cli_test_python_publication_repository" PUBLICATION_HREF="$(echo "$OUTPUT" | jq -r .pulp_href)" expect_succ pulp python publication destroy --href "$PUBLICATION_HREF" -expect_succ pulp python publication create --repository "cli_test_python_repository" --version 0 +expect_succ pulp python publication create --repository "cli_test_python_publication_repository" --version 0 PUBLICATION_HREF="$(echo "$OUTPUT" | jq -r .pulp_href)" expect_succ pulp python publication destroy --href "$PUBLICATION_HREF" diff --git a/tests/scripts/pulp_python/test_repository.sh b/tests/scripts/pulp_python/test_repository.sh index 7ec8af45c..54f0562d3 100755 --- a/tests/scripts/pulp_python/test_repository.sh +++ b/tests/scripts/pulp_python/test_repository.sh @@ -8,21 +8,21 @@ pulp debug has-plugin --name "python" || exit 23 cleanup() { pulp python repository destroy --name "cli_test_python_repo" || true - pulp python remote destroy --name "cli_test_python_remote1" || true - pulp python remote destroy --name "cli_test_python_remote2" || true + pulp python remote destroy --name "cli_test_python_repository_remote1" || true + pulp python remote destroy --name "cli_test_python_repository_remote2" || true } trap cleanup EXIT -REMOTE1_HREF="$(pulp python remote create --name "cli_test_python_remote1" --url "http://a/" | jq -r '.pulp_href')" -REMOTE2_HREF="$(pulp python remote create --name "cli_test_python_remote2" --url "http://b/" | jq -r '.pulp_href')" +REMOTE1_HREF="$(pulp python remote create --name "cli_test_python_repository_remote1" --url "http://a/" | jq -r '.pulp_href')" +REMOTE2_HREF="$(pulp python remote create --name "cli_test_python_repository_remote2" --url "http://b/" | jq -r '.pulp_href')" expect_succ pulp python repository list expect_succ pulp python repository create --name "cli_test_python_repo" --description "Test repository for CLI tests" -expect_succ pulp python repository update --repository "cli_test_python_repo" --description "" --remote "cli_test_python_remote1" +expect_succ pulp python repository update --repository "cli_test_python_repo" --description "" --remote "cli_test_python_repository_remote1" expect_succ pulp python repository show --repository "cli_test_python_repo" expect_succ test "$(echo "$OUTPUT" | jq -r '.remote')" = "$REMOTE1_HREF" -expect_succ pulp python repository update --repository "cli_test_python_repo" --remote "cli_test_python_remote2" +expect_succ pulp python repository update --repository "cli_test_python_repo" --remote "cli_test_python_repository_remote2" expect_succ pulp python repository show --repository "cli_test_python_repo" expect_succ test "$(echo "$OUTPUT" | jq -r '.remote')" = "$REMOTE2_HREF" expect_succ pulp python repository update --repository "cli_test_python_repo" --remote "" diff --git a/tests/scripts/pulp_python/test_sync.sh b/tests/scripts/pulp_python/test_sync.sh index 8428a4be6..35b570dd1 100755 --- a/tests/scripts/pulp_python/test_sync.sh +++ b/tests/scripts/pulp_python/test_sync.sh @@ -7,39 +7,38 @@ set -eu pulp debug has-plugin --name "python" || exit 23 cleanup() { - pulp python repository destroy --name "cli_test_python_repository" || true - pulp python remote destroy --name "cli_test_python_remote" || true - pulp orphan cleanup || true + pulp python repository destroy --name "cli_test_python_sync_repository" || true + pulp python remote destroy --name "cli_test_python_sync_remote" || true } trap cleanup EXIT cleanup # Prepare -expect_succ pulp python remote create --name "cli_test_python_remote" --url "$PYTHON_REMOTE_URL" \ +expect_succ pulp python remote create --name "cli_test_python_sync_remote" --url "$PYTHON_REMOTE_URL" \ --includes '["shelf-reader", "aiohttp>=3.2.0,<3.3.1", "celery~=4.0", "Django>1.10.0,<=2.0.6"]' -expect_succ pulp python repository create --name "cli_test_python_repository" +expect_succ pulp python repository create --name "cli_test_python_sync_repository" # Test without remote (should fail) -expect_fail pulp python repository sync --repository "cli_test_python_repository" +expect_fail pulp python repository sync --repository "cli_test_python_sync_repository" # Test with remote -expect_succ pulp python repository sync --repository "cli_test_python_repository" --remote "cli_test_python_remote" +expect_succ pulp python repository sync --repository "cli_test_python_sync_repository" --remote "cli_test_python_sync_remote" # Preconfigure remote -expect_succ pulp python repository update --repository "cli_test_python_repository" --remote "cli_test_python_remote" +expect_succ pulp python repository update --repository "cli_test_python_sync_repository" --remote "cli_test_python_sync_remote" # Test with remote -expect_succ pulp python repository sync --repository "cli_test_python_repository" +expect_succ pulp python repository sync --repository "cli_test_python_sync_repository" # Verify sync -expect_succ pulp python repository version list --repository "cli_test_python_repository" +expect_succ pulp python repository version list --repository "cli_test_python_sync_repository" expect_succ test "$(echo "$OUTPUT" | jq -r length)" -eq 2 -expect_succ pulp python repository version show --repository "cli_test_python_repository" --version 1 +expect_succ pulp python repository version show --repository "cli_test_python_sync_repository" --version 1 expect_succ test "$(echo "$OUTPUT" | jq -r '.content_summary.present."python.python".count')" -eq 34 # Test repair the version -expect_succ pulp python repository version repair --repository "cli_test_python_repository" --version 1 +expect_succ pulp python repository version repair --repository "cli_test_python_sync_repository" --version 1 expect_succ test "$(echo "$OUTPUT" | jq -r '.state')" = "completed" # Delete version again -expect_succ pulp python repository version destroy --repository "cli_test_python_repository" --version 1 +expect_succ pulp python repository version destroy --repository "cli_test_python_sync_repository" --version 1 diff --git a/tests/scripts/pulp_rpm/test_acs.sh b/tests/scripts/pulp_rpm/test_acs.sh index 96833151f..36623f894 100755 --- a/tests/scripts/pulp_rpm/test_acs.sh +++ b/tests/scripts/pulp_rpm/test_acs.sh @@ -10,14 +10,13 @@ pulp debug has-plugin --name "rpm" --specifier ">=3.18.0" || exit 23 pulp debug has-plugin --name "rpm" --specifier "==3.20.0" && pulp debug has-plugin --name "core" --specifier "==3.23.21" && exit 23 acs_remote="cli_test_rpm_acs_remote" -acs="cli_test_acs" +acs="cli_test_rpm_acs" cleanup() { - pulp rpm repository destroy --name "cli-repo-metadata-only" || true + pulp rpm repository destroy --name "cli-rpm-acs-repo-metadata-only" || true pulp rpm acs destroy --name $acs || true pulp rpm remote destroy --name $acs_remote || true - pulp rpm remote destroy --name "cli-remote-metadata-only" || true - pulp orphan cleanup --protection-time 0 || true + pulp rpm remote destroy --name "cli-rpm-acs-remote-metadata-only" || true } trap cleanup EXIT @@ -25,7 +24,7 @@ cleanup expect_succ pulp rpm remote create --name $acs_remote --url "$PULP_FIXTURES_URL" --policy "on_demand" -expect_succ pulp rpm acs create --name $acs --remote $acs_remote --path "rpm-unsigned/" --path "rpm-richnweak-deps/" +expect_succ pulp rpm acs create --name $acs --remote $acs_remote --path "rpm-unsigned/" --path "rpm-signed/" HREF="$(echo "$OUTPUT" | jq -r '.pulp_href')" expect_succ pulp rpm acs list test "$(echo "$OUTPUT" | jq -r length)" -ge 1 @@ -47,10 +46,10 @@ expect_succ pulp task-group show --href "$task_group" test "$(echo "$OUTPUT" | jq ".tasks | length")" -eq 2 # create a remote with metadata only and sync it -expect_succ pulp rpm remote create --name "cli-remote-metadata-only" --url "$PULP_FIXTURES_URL/rpm-unsigned-meta-only/" +expect_succ pulp rpm remote create --name "cli-rpm-acs-remote-metadata-only" --url "$PULP_FIXTURES_URL/rpm-unsigned-meta-only/" remote_href="$(echo "$OUTPUT" | jq -r '.pulp_href')" -expect_succ pulp rpm repository create --name "cli-repo-metadata-only" --remote "$remote_href" -expect_succ pulp rpm repository sync --repository "cli-repo-metadata-only" +expect_succ pulp rpm repository create --name "cli-rpm-acs-repo-metadata-only" --remote "$remote_href" +expect_succ pulp rpm repository sync --repository "cli-rpm-acs-repo-metadata-only" # test refresh with bad paths expect_succ pulp rpm acs path add --acs $acs --path "bad-path/" diff --git a/tests/scripts/pulp_rpm/test_comps.sh b/tests/scripts/pulp_rpm/test_comps.sh index cbb0ff612..1bca2a683 100755 --- a/tests/scripts/pulp_rpm/test_comps.sh +++ b/tests/scripts/pulp_rpm/test_comps.sh @@ -7,21 +7,21 @@ set -eu pulp debug has-plugin --name "rpm" || exit 23 cleanup() { - pulp rpm repository destroy --name "cli_test_rpm_repository" || true + pulp rpm repository destroy --name "cli_test_rpm_comps_repository" || true } trap cleanup EXIT SMALLCOMPS="$(dirname "$(realpath "$0")")"/comps.xml LARGECOMPS="$(dirname "$(realpath "$0")")"/centos8-base-comps.xml -expect_succ pulp rpm repository create --name "cli_test_rpm_repository" +expect_succ pulp rpm repository create --name "cli_test_rpm_comps_repository" repo_href="$(echo "$OUTPUT" | jq -r '.pulp_href')" expect_succ pulp rpm comps-upload --file "${SMALLCOMPS}" test "$(echo "$OUTPUT" | jq -r '.created_resources | length')" = 4 # just comps-units expect_succ pulp rpm comps-upload --file "${SMALLCOMPS}" --repository "${repo_href}" test "$(echo "$OUTPUT" | jq -r '.created_resources | length')" = 5 # comps-units plus repo-version -expect_succ pulp rpm comps-upload --file "${LARGECOMPS}" --repository "cli_test_rpm_repository" +expect_succ pulp rpm comps-upload --file "${LARGECOMPS}" --repository "cli_test_rpm_comps_repository" test "$(echo "$OUTPUT" | jq -r '.created_resources | length')" = 43 # units + version -expect_succ pulp rpm comps-upload --file "${SMALLCOMPS}" --repository "cli_test_rpm_repository" +expect_succ pulp rpm comps-upload --file "${SMALLCOMPS}" --repository "cli_test_rpm_comps_repository" test "$(echo "$OUTPUT" | jq -r '.created_resources | length')" = 4 # just units (already there, no vers created) -expect_succ pulp rpm comps-upload --file "${SMALLCOMPS}" --repository "cli_test_rpm_repository" --replace True +expect_succ pulp rpm comps-upload --file "${SMALLCOMPS}" --repository "cli_test_rpm_comps_repository" --replace True test "$(echo "$OUTPUT" | jq -r '.created_resources | length')" = 5 # units+version diff --git a/tests/scripts/pulp_rpm/test_content.sh b/tests/scripts/pulp_rpm/test_content.sh index b4ac6144c..0ab287174 100755 --- a/tests/scripts/pulp_rpm/test_content.sh +++ b/tests/scripts/pulp_rpm/test_content.sh @@ -14,9 +14,9 @@ RPM_FILENAME="lemon-0-1.noarch.rpm" RPM2_FILENAME="icecubes-2-3.noarch.rpm" RPM_NAME="lemon" RPM2_NAME="icecubes" -REPO1_NAME="cli_test_rpm_content" -REPO2_NAME="cli_test_modular_content" -UPLOAD_REPO_NAME="cli_test_rpm_content_upload" +REPO1_NAME="cli_test_rpm_content_repo1" +REPO2_NAME="cli_test_rpm_modular_content_repo2" +UPLOAD_REPO_NAME="cli_test_rpm_content_upload_repo" PACKAGE_HREF= ADVISORY_HREF= cleanup() { @@ -26,8 +26,6 @@ cleanup() { pulp rpm repository destroy --name "${UPLOAD_REPO_NAME}" || true pulp rpm remote destroy --name "${REPO1_NAME}" || true pulp rpm remote destroy --name "${REPO2_NAME}" || true - # clean up everything else "asap" - pulp orphan cleanup --protection-time 0 || true } trap cleanup EXIT cleanup @@ -41,8 +39,8 @@ expect_succ pulp rpm content show --href "${PACKAGE_HREF}" # Test rpm-package directory-upload mkdir "$(dirname "$(realpath "$0")")"/test_rpm_upload pushd "$(dirname "$(realpath "$0")")"/test_rpm_upload -wget --no-check-certificate "${RPM_REMOTE_URL}/bear-4.1-1.noarch.rpm" -wget --no-check-certificate "${RPM_REMOTE_URL}/camel-0.1-1.noarch.rpm" +wget --no-check-certificate "${RPM_WEAK_DEPS_URL}/Cobbler-1-0.noarch.rpm" +wget --no-check-certificate "${RPM_WEAK_DEPS_URL}/PanAmerican-1-0.noarch.rpm" popd expect_succ pulp rpm repository create --name "${UPLOAD_REPO_NAME}" --no-autopublish expect_succ pulp rpm content upload --repository "rpm:rpm:${UPLOAD_REPO_NAME}" \ diff --git a/tests/scripts/pulp_rpm/test_prune.sh b/tests/scripts/pulp_rpm/test_prune.sh index 58b4d6700..c16571d32 100755 --- a/tests/scripts/pulp_rpm/test_prune.sh +++ b/tests/scripts/pulp_rpm/test_prune.sh @@ -31,5 +31,6 @@ expect_succ pulp rpm prune-packages --repository "${repo_href}" --keep-days 0 -- expect_succ pulp rpm prune-packages --repository "${repo_href}" --repository "${repo_href_2}" --dry-run expect_succ pulp rpm prune-packages --repository "rpm:rpm:cli_test_rpm_prune" --repository "rpm:rpm:cli_test_rpm_prune_2" --dry-run expect_succ pulp rpm prune-packages --repository "rpm:rpm:cli_test_rpm_prune" --repository "${repo_href}" --repository "${repo_href_2}" --dry-run -expect_succ pulp rpm prune-packages --all-repositories --dry-run +# This task can fail in parallel tests, so run in background. We only care that the task is created +expect_succ pulp -b rpm prune-packages --all-repositories --dry-run expect_succ pulp rpm prune-packages --repository "rpm:rpm:cli_test_rpm_prune" --keep-days 0 diff --git a/tests/scripts/pulp_rpm/test_rpm_sync_publish.sh b/tests/scripts/pulp_rpm/test_rpm_sync_publish.sh index b9c72ec9f..b971ae5e8 100755 --- a/tests/scripts/pulp_rpm/test_rpm_sync_publish.sh +++ b/tests/scripts/pulp_rpm/test_rpm_sync_publish.sh @@ -10,10 +10,10 @@ pulp debug has-plugin --name "rpm" || exit 23 pulp debug has-plugin --name "rpm" --specifier "==3.20.0" && pulp debug has-plugin --name "core" --specifier "==3.23.21" && exit 23 cleanup() { - pulp rpm distribution destroy --name "cli_test_rpm_distro" || true - pulp rpm repository destroy --name "cli_test_rpm_repository" || true - pulp rpm remote destroy --name "cli_test_rpm_remote" || true - pulp rpm repository destroy --repository "cli_test_rpm_repository2" || true + pulp rpm distribution destroy --name "cli_test_rpm_sync_distro" || true + pulp rpm repository destroy --name "cli_test_rpm_sync_repository" || true + pulp rpm remote destroy --name "cli_test_rpm_sync_remote" || true + pulp rpm repository destroy --repository "cli_test_rpm_sync_repository2" || true } trap cleanup EXIT @@ -29,107 +29,107 @@ cat <> repo_config.json EOT -expect_succ pulp rpm remote create --name "cli_test_rpm_remote" --url "$RPM_REMOTE_URL" -expect_succ pulp rpm remote show --name "cli_test_rpm_remote" -expect_succ pulp rpm repository create --name "cli_test_rpm_repository" --remote "cli_test_rpm_remote" --description "cli test repository" -expect_succ pulp rpm repository update --repository "cli_test_rpm_repository" --description "" -expect_succ pulp rpm repository show --repository "cli_test_rpm_repository" +expect_succ pulp rpm remote create --name "cli_test_rpm_sync_remote" --url "$RPM_REMOTE_URL" +expect_succ pulp rpm remote show --name "cli_test_rpm_sync_remote" +expect_succ pulp rpm repository create --name "cli_test_rpm_sync_repository" --remote "cli_test_rpm_sync_remote" --description "cli test repository" +expect_succ pulp rpm repository update --repository "cli_test_rpm_sync_repository" --description "" +expect_succ pulp rpm repository show --repository "cli_test_rpm_sync_repository" test "$(echo "$OUTPUT" | jq -r '.description')" = "null" # sqlite metadata removal from pulp_rpm (pulp/pulp_rpm#3328) if pulp debug has-plugin --name "rpm" --specifier "<3.25.0" then - expect_succ pulp rpm repository update --name "cli_test_rpm_repository" --no-sqlite-metadata + expect_succ pulp rpm repository update --name "cli_test_rpm_sync_repository" --no-sqlite-metadata else - expect_fail pulp rpm repository update --name "cli_test_rpm_repository" --no-sqlite-metadata + expect_fail pulp rpm repository update --name "cli_test_rpm_sync_repository" --no-sqlite-metadata fi if pulp debug has-plugin --name "rpm" --specifier ">=3.24.0" then -expect_succ pulp rpm repository create --name "cli_test_rpm_repository2" --repo-config "@repo_config.json" +expect_succ pulp rpm repository create --name "cli_test_rpm_sync_repository2" --repo-config "@repo_config.json" test "$(echo "$OUTPUT" | jq -r '.repo_config.assumeyes')" = "true" fi -expect_succ pulp rpm repository sync --repository "cli_test_rpm_repository" --skip-type srpm +expect_succ pulp rpm repository sync --repository "cli_test_rpm_sync_repository" --skip-type srpm if pulp debug has-plugin --name "rpm" --specifier ">=3.19.0" then - expect_succ pulp rpm repository sync --name "cli_test_rpm_repository" --skip-type treeinfo - expect_succ pulp rpm repository sync --name "cli_test_rpm_repository" --skip-type treeinfo --skip-type srpm + expect_succ pulp rpm repository sync --name "cli_test_rpm_sync_repository" --skip-type treeinfo + expect_succ pulp rpm repository sync --name "cli_test_rpm_sync_repository" --skip-type treeinfo --skip-type srpm fi -expect_succ pulp rpm repository sync --name "cli_test_rpm_repository" +expect_succ pulp rpm repository sync --name "cli_test_rpm_sync_repository" -expect_succ pulp rpm publication create --repository "cli_test_rpm_repository" +expect_succ pulp rpm publication create --repository "cli_test_rpm_sync_repository" PUBLICATION_HREF=$(echo "$OUTPUT" | jq -r .pulp_href) -expect_succ pulp rpm publication create --repository "cli_test_rpm_repository" --version 0 +expect_succ pulp rpm publication create --repository "cli_test_rpm_sync_repository" --version 0 PUBLICATION_VER_HREF=$(echo "$OUTPUT" | jq -r .pulp_href) if pulp debug has-plugin --name "rpm" --specifier ">=3.24.0" then -expect_succ pulp rpm publication create --repository "cli_test_rpm_repository" --repo-config "@repo_config.json" +expect_succ pulp rpm publication create --repository "cli_test_rpm_sync_repository" --repo-config "@repo_config.json" test "$(echo "$OUTPUT" | jq -r '.repo_config.assumeyes')" = "true" expect_succ pulp rpm publication destroy --href "$(echo "$OUTPUT" | jq -r '.pulp_href')" fi -expect_succ pulp rpm distribution create --name "cli_test_rpm_distro" \ - --base-path "cli_test_rpm_distro" \ +expect_succ pulp rpm distribution create --name "cli_test_rpm_sync_distro" \ + --base-path "cli_test_rpm_sync_distro" \ --publication "$PUBLICATION_HREF" if pulp debug has-plugin --name "rpm" --specifier ">=3.23.0" then - expect_succ pulp rpm distribution create --name "cli_test_rpm_distro2" \ - --base-path "cli_test_rpm_distro2" \ + expect_succ pulp rpm distribution create --name "cli_test_rpm_sync_distro2" \ + --base-path "cli_test_rpm_sync_distro2" \ --publication "$PUBLICATION_HREF" \ --generate-repo-config - expect_succ pulp rpm distribution destroy --name "cli_test_rpm_distro2" + expect_succ pulp rpm distribution destroy --name "cli_test_rpm_sync_distro2" fi -expect_succ pulp rpm repository version list --repository "cli_test_rpm_repository" -expect_succ pulp rpm repository version repair --repository "cli_test_rpm_repository" --version 1 +expect_succ pulp rpm repository version list --repository "cli_test_rpm_sync_repository" +expect_succ pulp rpm repository version repair --repository "cli_test_rpm_sync_repository" --version 1 -expect_succ pulp rpm repository update --name "cli_test_rpm_repository" --retain-package-versions 2 -expect_succ pulp rpm repository show --name "cli_test_rpm_repository" +expect_succ pulp rpm repository update --name "cli_test_rpm_sync_repository" --retain-package-versions 2 +expect_succ pulp rpm repository show --name "cli_test_rpm_sync_repository" test "$(echo "$OUTPUT" | jq -r '.retain_package_versions')" = "2" -expect_succ pulp rpm repository sync --repository "cli_test_rpm_repository" --optimize -expect_succ pulp rpm repository sync --repository "cli_test_rpm_repository" --no-optimize +expect_succ pulp rpm repository sync --repository "cli_test_rpm_sync_repository" --optimize +expect_succ pulp rpm repository sync --repository "cli_test_rpm_sync_repository" --no-optimize -expect_succ pulp rpm repository update --repository "cli_test_rpm_repository" --retain-package-versions 0 -expect_succ pulp rpm repository sync --repository "cli_test_rpm_repository" --sync-policy additive -expect_succ pulp rpm repository sync --repository "cli_test_rpm_repository" --sync-policy mirror_complete -expect_succ pulp rpm repository sync --repository "cli_test_rpm_repository" --sync-policy mirror_content_only -expect_fail pulp rpm repository sync --repository "cli_test_rpm_repository" --sync-policy foobar +expect_succ pulp rpm repository update --repository "cli_test_rpm_sync_repository" --retain-package-versions 0 +expect_succ pulp rpm repository sync --repository "cli_test_rpm_sync_repository" --sync-policy additive +expect_succ pulp rpm repository sync --repository "cli_test_rpm_sync_repository" --sync-policy mirror_complete +expect_succ pulp rpm repository sync --repository "cli_test_rpm_sync_repository" --sync-policy mirror_content_only +expect_fail pulp rpm repository sync --repository "cli_test_rpm_sync_repository" --sync-policy foobar if pulp debug has-plugin --name "rpm" --specifier ">=3.25.0" then - expect_succ pulp rpm publication create --repository "cli_test_rpm_repository" --checksum-type sha512 - expect_fail pulp rpm publication create --repository "cli_test_rpm_repository" --checksum-type sha1 + expect_succ pulp rpm publication create --repository "cli_test_rpm_sync_repository" --checksum-type sha512 + expect_fail pulp rpm publication create --repository "cli_test_rpm_sync_repository" --checksum-type sha1 - expect_succ pulp rpm repository update --name "cli_test_rpm_repository" --checksum-type sha512 - expect_fail pulp rpm repository update --name "cli_test_rpm_repository" --checksum-type sha1 + expect_succ pulp rpm repository update --name "cli_test_rpm_sync_repository" --checksum-type sha512 + expect_fail pulp rpm repository update --name "cli_test_rpm_sync_repository" --checksum-type sha1 else - expect_succ pulp rpm repository update --name "cli_test_rpm_repository" --metadata-checksum-type sha1 - expect_succ pulp rpm repository update --name "cli_test_rpm_repository" --package-checksum-type sha1 + expect_succ pulp rpm repository update --name "cli_test_rpm_sync_repository" --metadata-checksum-type sha1 + expect_succ pulp rpm repository update --name "cli_test_rpm_sync_repository" --package-checksum-type sha1 fi -expect_succ pulp rpm distribution destroy --name "cli_test_rpm_distro" +expect_succ pulp rpm distribution destroy --name "cli_test_rpm_sync_distro" expect_succ pulp rpm publication destroy --href "$PUBLICATION_HREF" expect_succ pulp rpm publication destroy --href "$PUBLICATION_VER_HREF" -expect_succ pulp rpm repository destroy --repository "cli_test_rpm_repository" -expect_succ pulp rpm remote destroy --remote "cli_test_rpm_remote" +expect_succ pulp rpm repository destroy --repository "cli_test_rpm_sync_repository" +expect_succ pulp rpm remote destroy --remote "cli_test_rpm_sync_remote" # auto-publish -expect_succ pulp rpm remote create --name "cli_test_rpm_remote" --url "$RPM_REMOTE_URL" -expect_succ pulp rpm repository create --name "cli_test_rpm_repository" --remote "cli_test_rpm_remote" --autopublish +expect_succ pulp rpm remote create --name "cli_test_rpm_sync_remote" --url "$RPM_REMOTE_URL" +expect_succ pulp rpm repository create --name "cli_test_rpm_sync_repository" --remote "cli_test_rpm_sync_remote" --autopublish -expect_succ pulp rpm distribution create --name "cli_test_rpm_distro" \ - --base-path "cli_test_rpm_distro" \ - --repository "cli_test_rpm_repository" +expect_succ pulp rpm distribution create --name "cli_test_rpm_sync_distro" \ + --base-path "cli_test_rpm_sync_distro" \ + --repository "cli_test_rpm_sync_repository" -expect_succ pulp rpm repository sync --repository "cli_test_rpm_repository" +expect_succ pulp rpm repository sync --repository "cli_test_rpm_sync_repository" if pulp debug has-plugin --name "rpm" --specifier ">=3.20.0" then - expect_succ pulp rpm publication list --repository rpm:rpm:cli_test_rpm_repository + expect_succ pulp rpm publication list --repository rpm:rpm:cli_test_rpm_sync_repository else expect_succ pulp rpm publication list fi -test "$(echo "$OUTPUT" | jq -r length)" -eq "1" +test "$(echo "$OUTPUT" | jq -r length)" -ge "1" diff --git a/tests/scripts/pulpcore/test_artifact.sh b/tests/scripts/pulpcore/test_artifact.sh index 8f047131f..6adb28784 100755 --- a/tests/scripts/pulpcore/test_artifact.sh +++ b/tests/scripts/pulpcore/test_artifact.sh @@ -4,10 +4,6 @@ set -eu # shellcheck source=tests/scripts/config.source . "$(dirname "$(dirname "$(realpath "$0")")")"/config.source -cleanup() { - pulp orphan cleanup -} -trap cleanup EXIT dd if=/dev/urandom of=test.txt bs=2MiB count=1 dd if=/dev/urandom of=test2.txt bs=10KiB count=1 diff --git a/tests/scripts/pulpcore/test_content_guards.sh b/tests/scripts/pulpcore/test_content_guards.sh index dd23114ef..3169a125c 100755 --- a/tests/scripts/pulpcore/test_content_guards.sh +++ b/tests/scripts/pulpcore/test_content_guards.sh @@ -8,7 +8,7 @@ cleanup() { pulp content-guard composite destroy --name "cli_test_composite_guard" || true pulp content-guard header destroy --name "cli_test_header_guard" || true pulp content-guard rbac destroy --name "cli_test_rbac_guard" || true - pulp group destroy --name "cli_test_group" || true + pulp group destroy --name "cli_test_content_guard_group" || true } trap cleanup EXIT @@ -19,11 +19,11 @@ expect_succ pulp content-guard rbac list --name "cli_test_rbac_guard" test "$(echo "$OUTPUT" | jq -r length)" -eq "1" expect_succ pulp content-guard rbac show --name "cli_test_rbac_guard" -expect_succ pulp group create --name "cli_test_group" -expect_succ pulp content-guard rbac assign --name "cli_test_rbac_guard" --group "cli_test_group" +expect_succ pulp group create --name "cli_test_content_guard_group" +expect_succ pulp content-guard rbac assign --name "cli_test_rbac_guard" --group "cli_test_content_guard_group" expect_succ pulp content-guard rbac show --name "cli_test_rbac_guard" test "$(echo "$OUTPUT" | jq -r '.groups' | jq -r length)" -eq "1" -expect_succ pulp content-guard rbac remove --name "cli_test_rbac_guard" --user "admin" --group "cli_test_group" +expect_succ pulp content-guard rbac remove --name "cli_test_rbac_guard" --user "admin" --group "cli_test_content_guard_group" expect_succ pulp content-guard rbac show --name "cli_test_rbac_guard" test "$(echo "$OUTPUT" | jq -r '.users' | jq -r length)" -eq "0" test "$(echo "$OUTPUT" | jq -r '.groups' | jq -r length)" -eq "0" diff --git a/tests/scripts/pulpcore/test_group_permissions.sh b/tests/scripts/pulpcore/test_group_permissions.sh index c4aaccad5..896e8ca8a 100755 --- a/tests/scripts/pulpcore/test_group_permissions.sh +++ b/tests/scripts/pulpcore/test_group_permissions.sh @@ -7,20 +7,20 @@ set -eu pulp debug has-plugin --name "core" --specifier "<3.20-dev" || exit 23 cleanup() { - pulp group destroy --name "cli_test_group" || true + pulp group destroy --name "cli_test_group_permissions" || true pulp file repository destroy --name "cli_group_test_repository" || true } trap cleanup EXIT -expect_succ pulp group create --name "cli_test_group" +expect_succ pulp group create --name "cli_test_group_permissions" -expect_succ pulp group permission add --group "cli_test_group" --permission "core.view_task" -expect_succ pulp group permission add --group "cli_test_group" --permission "auth.view_group" -expect_succ pulp group permission list --group "cli_test_group" -expect_succ pulp group permission remove --group "cli_test_group" --permission "core.view_task" +expect_succ pulp group permission add --group "cli_test_group_permissions" --permission "core.view_task" +expect_succ pulp group permission add --group "cli_test_group_permissions" --permission "auth.view_group" +expect_succ pulp group permission list --group "cli_test_group_permissions" +expect_succ pulp group permission remove --group "cli_test_group_permissions" --permission "core.view_task" expect_succ pulp file repository create --name "cli_group_test_repository" REPO_HREF="$(echo "$OUTPUT" | jq -r '.pulp_href')" -expect_succ pulp group permission -t object add --group "cli_test_group" --permission "file.view_filerepository" --object "$REPO_HREF" -expect_succ pulp group permission -t object list --group "cli_test_group" -expect_succ pulp group permission -t object remove --group "cli_test_group" --permission "file.view_filerepository" --object "$REPO_HREF" +expect_succ pulp group permission -t object add --group "cli_test_group_permissions" --permission "file.view_filerepository" --object "$REPO_HREF" +expect_succ pulp group permission -t object list --group "cli_test_group_permissions" +expect_succ pulp group permission -t object remove --group "cli_test_group_permissions" --permission "file.view_filerepository" --object "$REPO_HREF" diff --git a/tests/scripts/pulpcore/test_orphans.sh b/tests/scripts/pulpcore/test_orphans.sh index 859942ced..03fc22ff8 100755 --- a/tests/scripts/pulpcore/test_orphans.sh +++ b/tests/scripts/pulpcore/test_orphans.sh @@ -11,20 +11,9 @@ test "$(echo "${OUTPUT}" | jq -r '.state' )" = "completed" pulp debug has-plugin --name "file" || exit 23 dd if=/dev/urandom of=test_1.txt bs=2MiB count=1 -dd if=/dev/urandom of=test_2.txt bs=2MiB count=1 -dd if=/dev/urandom of=test_3.txt bs=2MiB count=1 expect_succ pulp file content upload --file test_1.txt --relative-path orphan_test/test_1.txt -expect_succ pulp file content upload --file test_2.txt --relative-path orphan_test/test_2.txt -expect_succ pulp file content upload --file test_3.txt --relative-path orphan_test/test_3.txt +content_href=$(echo "${OUTPUT}" | jq -r .pulp_href) -content_href="$(echo "$OUTPUT" | jq -r .pulp_href)" -expect_succ pulp file content list -count="$(echo "$OUTPUT" | jq -r length)" -expect_succ pulp orphan cleanup --protection-time 0 --content-hrefs "[\"$content_href\"]" - -expect_succ pulp file content list -test "$(echo "$OUTPUT" | jq -r length)" -eq "$((count-1))" -expect_succ pulp orphan cleanup - -expect_succ pulp orphan cleanup --protection-time 0 +expect_succ pulp orphan cleanup --content-hrefs "[\"$content_href\"]" +expect_succ pulp orphan cleanup --protection-time 10 diff --git a/tests/scripts/pulpcore/test_pulpexporter.sh b/tests/scripts/pulpcore/test_pulpexporter.sh index ecfc40d4f..cc28347bb 100755 --- a/tests/scripts/pulpcore/test_pulpexporter.sh +++ b/tests/scripts/pulpcore/test_pulpexporter.sh @@ -8,7 +8,7 @@ pulp debug has-plugin --name "file" || exit 23 eval "$(pulp status | jq -r '.domain_enabled // false | not')" || exit 23 -RMOTE="cli_test_file_remote" +RMOTE="cli_test_core_export_remote" REPO1="cli_test_pulpexporter_repository_1" REPO2="cli_test_pulpexporter_repository_2" NAME1="cli_test_exporter_1" diff --git a/tests/scripts/pulpcore/test_pulpimporter.sh b/tests/scripts/pulpcore/test_pulpimporter.sh index 36d967afc..9a3428a1c 100755 --- a/tests/scripts/pulpcore/test_pulpimporter.sh +++ b/tests/scripts/pulpcore/test_pulpimporter.sh @@ -10,13 +10,13 @@ eval "$(pulp status | jq -r '.domain_enabled // false | not')" || exit 23 cleanup() { pulp importer pulp destroy --name "cli_test_importer" || true - pulp file repository destroy --name dest1 || true - pulp file repository destroy --name dest2 || true + pulp file repository destroy --name core:import:dest1 || true + pulp file repository destroy --name core:import:dest2 || true } trap cleanup EXIT -expect_succ pulp file repository create --name dest1 -expect_succ pulp file repository create --name dest2 +expect_succ pulp file repository create --name core:import:dest1 +expect_succ pulp file repository create --name core:import:dest2 # create, show, destroy expect_succ pulp importer pulp create --name "cli_test_importer" @@ -26,12 +26,12 @@ test "$(echo "$OUTPUT" | jq -r length)" -eq 1 expect_succ pulp importer pulp destroy --name "cli_test_importer" # create with a repo mapping -expect_succ pulp importer pulp create --name "cli_test_importer" --repo-map src1 dest1 +expect_succ pulp importer pulp create --name "cli_test_importer" --repo-map src1 core:import:dest1 test "$(echo "$OUTPUT" | jq '.repo_mapping' | jq -r length)" -eq 1 -test "$(echo "$OUTPUT" | jq '.repo_mapping.src1')" = "\"dest1\"" +test "$(echo "$OUTPUT" | jq '.repo_mapping.src1')" = "\"core:import:dest1\"" # update repo mapping -expect_succ pulp importer pulp update --name "cli_test_importer" --repo-map src1 dest1 --repo-map src2 dest2 +expect_succ pulp importer pulp update --name "cli_test_importer" --repo-map src1 core:import:dest1 --repo-map src2 core:import:dest2 test "$(echo "$OUTPUT" | jq '.repo_mapping' | jq -r length)" -eq 2 -test "$(echo "$OUTPUT" | jq '.repo_mapping.src1')" = "\"dest1\"" -test "$(echo "$OUTPUT" | jq '.repo_mapping.src2')" = "\"dest2\"" +test "$(echo "$OUTPUT" | jq '.repo_mapping.src1')" = "\"core:import:dest1\"" +test "$(echo "$OUTPUT" | jq '.repo_mapping.src2')" = "\"core:import:dest2\"" diff --git a/tests/scripts/pulpcore/test_repository_reclaim_space.sh b/tests/scripts/pulpcore/test_repository_reclaim_space.sh index dfccae846..dded69a1a 100755 --- a/tests/scripts/pulpcore/test_repository_reclaim_space.sh +++ b/tests/scripts/pulpcore/test_repository_reclaim_space.sh @@ -15,7 +15,7 @@ cleanup() { trap cleanup EXIT # Setup needed prerequisites -expect_succ pulp file remote create --name "cli_test_reclaim_remote" --url "$FILE_REMOTE_URL" --policy immediate +expect_succ pulp file remote create --name "cli_test_reclaim_remote" --url "$FILE_REMOTE2_URL" --policy immediate expect_succ pulp file repository create --name "cli_test_reclaim_repo" --remote "cli_test_reclaim_remote" --autopublish expect_succ pulp file repository sync --name "cli_test_reclaim_repo" expect_succ pulp file distribution create --name "cli_test_reclaim_distro" --base-path "cli_test_reclaim_distro" --repository "cli_test_reclaim_repo" diff --git a/tests/scripts/pulpcore/test_role.sh b/tests/scripts/pulpcore/test_role.sh index 99be86c5d..ab7d72464 100755 --- a/tests/scripts/pulpcore/test_role.sh +++ b/tests/scripts/pulpcore/test_role.sh @@ -7,49 +7,49 @@ set -eu USERPASS="Yeech6ba" cleanup() { - pulp group destroy --name "clitest" || true - pulp group destroy --name "clitest2" || true - pulp user destroy --username "clitest" || true - pulp role destroy --name "clitest.group_viewer" || true + pulp group destroy --name "core-role-clitest" || true + pulp group destroy --name "core-role-clitest2" || true + pulp user destroy --username "core-role-clitest" || true + pulp role destroy --name "core-role-clitest.group_viewer" || true } trap cleanup EXIT expect_succ pulp role list expect_succ pulp role show --name "core.task_owner" -expect_succ pulp role create --name "clitest.group_viewer" --permission "core.view_group" -expect_succ pulp role show --name "clitest.group_viewer" +expect_succ pulp role create --name "core-role-clitest.group_viewer" --permission "core.view_group" +expect_succ pulp role show --name "core-role-clitest.group_viewer" -expect_succ pulp user create --username "clitest" --password "${USERPASS}" -expect_succ pulp group create --name "clitest" +expect_succ pulp user create --username "core-role-clitest" --password "${USERPASS}" +expect_succ pulp group create --name "core-role-clitest" GROUP_HREF=$(jq -r '.pulp_href' <<<"${OUTPUT}") -expect_succ pulp group user add --group "clitest" --username "clitest" +expect_succ pulp group user add --group "core-role-clitest" --username "core-role-clitest" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" task list +expect_succ pulp -p noauth --username core-role-clitest --password "${USERPASS}" task list test "$(echo "${OUTPUT}" | jq -r 'length' )" = "0" -expect_fail pulp -p noauth --username clitest --password "${USERPASS}" group show --name "clitest" +expect_fail pulp -p noauth --username core-role-clitest --password "${USERPASS}" group show --name "core-role-clitest" -expect_succ pulp user role-assignment add --username "clitest" --role "clitest.group_viewer" --object "${GROUP_HREF}" -expect_succ pulp user role-assignment list --username "clitest" --role "clitest.group_viewer" --object "${GROUP_HREF}" +expect_succ pulp user role-assignment add --username "core-role-clitest" --role "core-role-clitest.group_viewer" --object "${GROUP_HREF}" +expect_succ pulp user role-assignment list --username "core-role-clitest" --role "core-role-clitest.group_viewer" --object "${GROUP_HREF}" test "$(echo "${OUTPUT}" | jq -r 'length' )" = "1" -expect_succ pulp user role-assignment list --username "clitest" --role-in "clitest.group_viewer" --object "${GROUP_HREF}" +expect_succ pulp user role-assignment list --username "core-role-clitest" --role-in "core-role-clitest.group_viewer" --object "${GROUP_HREF}" test "$(echo "${OUTPUT}" | jq -r 'length' )" = "1" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" group show --name "clitest" -expect_succ pulp user role-assignment remove --username "clitest" --role "clitest.group_viewer" --object "${GROUP_HREF}" -expect_fail pulp -p noauth --username clitest --password "${USERPASS}" group show --name "clitest" +expect_succ pulp -p noauth --username core-role-clitest --password "${USERPASS}" group show --name "core-role-clitest" +expect_succ pulp user role-assignment remove --username "core-role-clitest" --role "core-role-clitest.group_viewer" --object "${GROUP_HREF}" +expect_fail pulp -p noauth --username core-role-clitest --password "${USERPASS}" group show --name "core-role-clitest" -expect_succ pulp group role-assignment add --group "clitest" --role "clitest.group_viewer" --object "${GROUP_HREF}" -expect_succ pulp group role-assignment list --group "clitest" --role "clitest.group_viewer" --object "${GROUP_HREF}" +expect_succ pulp group role-assignment add --group "core-role-clitest" --role "core-role-clitest.group_viewer" --object "${GROUP_HREF}" +expect_succ pulp group role-assignment list --group "core-role-clitest" --role "core-role-clitest.group_viewer" --object "${GROUP_HREF}" test "$(echo "${OUTPUT}" | jq -r 'length' )" = "1" -expect_succ pulp group role-assignment list --group "clitest" --role-in "clitest.group_viewer" --object "${GROUP_HREF}" +expect_succ pulp group role-assignment list --group "core-role-clitest" --role-in "core-role-clitest.group_viewer" --object "${GROUP_HREF}" test "$(echo "${OUTPUT}" | jq -r 'length' )" = "1" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" group show --name "clitest" -expect_succ pulp group role-assignment remove --group "clitest" --role "clitest.group_viewer" --object "${GROUP_HREF}" -expect_fail pulp -p noauth --username clitest --password "${USERPASS}" group show --name "clitest" +expect_succ pulp -p noauth --username core-role-clitest --password "${USERPASS}" group show --name "core-role-clitest" +expect_succ pulp group role-assignment remove --group "core-role-clitest" --role "core-role-clitest.group_viewer" --object "${GROUP_HREF}" +expect_fail pulp -p noauth --username core-role-clitest --password "${USERPASS}" group show --name "core-role-clitest" -expect_succ pulp user role-assignment add --username "clitest" --role "core.group_creator" --object "" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" group create --name "clitest2" -expect_succ pulp -p noauth --username clitest --password "${USERPASS}" group role my-permissions --name "clitest2" +expect_succ pulp user role-assignment add --username "core-role-clitest" --role "core.group_creator" --object "" +expect_succ pulp -p noauth --username core-role-clitest --password "${USERPASS}" group create --name "core-role-clitest2" +expect_succ pulp -p noauth --username core-role-clitest --password "${USERPASS}" group role my-permissions --name "core-role-clitest2" -expect_succ pulp role destroy --name "clitest.group_viewer" +expect_succ pulp role destroy --name "core-role-clitest.group_viewer" diff --git a/tests/scripts/pulpcore/test_show.sh b/tests/scripts/pulpcore/test_show.sh index d640536c8..9768b68b7 100755 --- a/tests/scripts/pulpcore/test_show.sh +++ b/tests/scripts/pulpcore/test_show.sh @@ -7,15 +7,15 @@ set -eu pulp debug has-plugin --name "file" || exit 23 cleanup() { - pulp file repository destroy --name "cli_test_file_repo" || true - pulp file remote destroy --name "cli_test_file_remote" || true + pulp file repository destroy --name "cli_test_core_show_repo" || true + pulp file remote destroy --name "cli_test_core_show_remote" || true } trap cleanup EXIT -expect_succ pulp file repository create --name "cli_test_file_repo" +expect_succ pulp file repository create --name "cli_test_core_show_repo" repo_href="$(echo "$OUTPUT" | jq -r .pulp_href)" expect_succ pulp show --href "$repo_href" -expect_succ pulp file remote create --name "cli_test_file_remote" --url "$FILE_REMOTE_URL" +expect_succ pulp file remote create --name "cli_test_core_show_remote" --url "$FILE_REMOTE_URL" remote_href="$(echo "$OUTPUT" | jq -r .pulp_href)" expect_succ pulp show --href "$remote_href" diff --git a/tests/scripts/pulpcore/test_task.sh b/tests/scripts/pulpcore/test_task.sh index 294142d5a..3ff85c102 100755 --- a/tests/scripts/pulpcore/test_task.sh +++ b/tests/scripts/pulpcore/test_task.sh @@ -7,14 +7,12 @@ set -eu pulp debug has-plugin --name "file" || exit 23 cleanup() { - pulp file repository destroy --name "cli_test_file_repository" || true - pulp file remote destroy --name "cli_test_file_remote" || true - pulp file remote destroy --name "cli_test_file_large_remote" || true - pulp orphan cleanup --protection-time 0 || true + pulp file repository destroy --name "cli_test_core_task_repository" || true + pulp file remote destroy --name "cli_test_core_task_remote" || true + pulp file remote destroy --name "cli_test_core_task_large_remote" || true } trap cleanup EXIT -pulp orphan cleanup --protection-time 0 || true expected_repo_task_count=1 sync_task="pulp_file.app.tasks.synchronizing.synchronize" @@ -24,16 +22,16 @@ expect_succ pulp worker list --limit 1 worker="$(echo "$OUTPUT" | jq -r '.[0].pulp_href')" worker_name="$(echo "$OUTPUT" | jq -r '.[0].name')" -expect_succ pulp file remote create --name "cli_test_file_remote" --url "$FILE_REMOTE_URL" +expect_succ pulp file remote create --name "cli_test_core_task_remote" --url "$FILE_REMOTE_URL" remote_href="$(echo "$OUTPUT" | jq -r '.pulp_href')" -expect_succ pulp file remote create --name "cli_test_file_large_remote" --url "$FILE_LARGE_REMOTE_URL" -expect_succ pulp file repository create --name "cli_test_file_repository" --remote "cli_test_file_remote" +expect_succ pulp file remote create --name "cli_test_core_task_large_remote" --url "$FILE_LARGE_REMOTE_URL" +expect_succ pulp file repository create --name "cli_test_core_task_repository" --remote "cli_test_core_task_remote" repository_href="$(echo "$OUTPUT" | jq -r '.pulp_href')" # Test canceling a task introduced in 3.12, but not reliable in 3.18 if pulp debug has-plugin --name "core" --specifier ">=3.21.0" then - expect_succ pulp --background file repository sync --name "cli_test_file_repository" --remote "cli_test_file_large_remote" + expect_succ pulp --background file repository sync --name "cli_test_core_task_repository" --remote "cli_test_core_task_large_remote" task="$(echo "$ERROUTPUT" | grep -E -o "${PULP_API_ROOT}([-_a-zA-Z0-9]+/)?api/v3/tasks/[-[:xdigit:]]*/")" if expect_succ pulp task cancel --href "$task" then @@ -50,10 +48,10 @@ then expected_repo_task_count=$((expected_repo_task_count + 1)) fi -expect_succ pulp --dry-run task cancel --all +expect_fail pulp --dry-run task cancel --all # Test waiting for a task -expect_succ pulp --background file repository sync --name "cli_test_file_repository" +expect_succ pulp --background file repository sync --name "cli_test_core_task_repository" task=$(echo "$ERROUTPUT" | grep -E -o "${PULP_API_ROOT}([-_a-zA-Z0-9]+/)?api/v3/tasks/[-[:xdigit:]]*/") task_uuid="${task%/}" task_uuid="${task_uuid##*/}" diff --git a/tests/scripts/pulpcore/test_user.sh b/tests/scripts/pulpcore/test_user.sh index dc9be39b7..4ec42504f 100755 --- a/tests/scripts/pulpcore/test_user.sh +++ b/tests/scripts/pulpcore/test_user.sh @@ -5,11 +5,11 @@ set -eu . "$(dirname "$(dirname "$(realpath "$0")")")"/config.source cleanup() { - pulp user destroy --username "clitest" || true + pulp user destroy --username "core-user-clitest" || true } trap cleanup EXIT expect_succ pulp user list expect_succ pulp user show --username admin -expect_succ pulp user create --username "clitest" --password "Yeech6ba" -expect_succ pulp user update --username "clitest" --first-name "cli" --last-name "test" +expect_succ pulp user create --username "core-user-clitest" --password "Yeech6ba" +expect_succ pulp user update --username "core-user-clitest" --first-name "cli" --last-name "test"