diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml index 7902d0526..d41728ebd 100644 --- a/.zuul.d/jobs.yaml +++ b/.zuul.d/jobs.yaml @@ -200,6 +200,8 @@ parent: ansible-buildset-registry-consumer requires: - ansible-runner-container-image + dependencies: + - ansible-buildset-registry vars: container_command: podman nodeset: centos-8-stream diff --git a/test/integration/containerized/test_cli_containerized.py b/test/integration/containerized/test_cli_containerized.py index 56b159931..fc0a55df8 100644 --- a/test/integration/containerized/test_cli_containerized.py +++ b/test/integration/containerized/test_cli_containerized.py @@ -29,45 +29,3 @@ def test_playbook_run(cli, skip_if_no_podman): def test_provide_env_var(cli, skip_if_no_podman, test_data_dir): r = cli(['run', os.path.join(test_data_dir, 'job_env'), '-p', 'printenv.yml']) assert 'gifmyvqok2' in r.stdout, r.stdout - - -@pytest.mark.serial -def test_adhoc_localhost_setup(cli, skip_if_no_podman, container_runtime_installed): - r = cli( - [ - 'adhoc', - '--private-data-dir', os.path.join(HERE, 'priv_data'), - '--container-runtime', container_runtime_installed, - 'localhost', '-m', 'setup' - ] - ) - # TODO: look for some fact that indicates we are in container? - assert '"ansible_facts": {' in r.stdout - - -@pytest.mark.serial -def test_playbook_with_private_data_dir(cli, skip_if_no_podman, container_runtime_installed): - # tests using a private_data_dir in conjunction with an absolute path - r = cli( - [ - 'playbook', - '--private-data-dir', os.path.join(HERE, 'priv_data'), - '--container-runtime', container_runtime_installed, - os.path.join(HERE, 'priv_data/project/test-container.yml') - ] - ) - assert 'PLAY RECAP *******' in r.stdout - assert 'failed=0' in r.stdout - - -@pytest.mark.serial -def test_playbook_with_relative_path(cli, skip_if_no_podman, container_runtime_installed): - r = cli( - [ - 'playbook', - '--container-runtime', container_runtime_installed, - 'test/integration/containerized/priv_data/project/test-container.yml' - ] - ) - assert 'PLAY RECAP *******' in r.stdout - assert 'failed=0' in r.stdout