Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adopt community-ansible-dev-tools image #1819

Merged
merged 13 commits into from
Jul 17, 2024
Merged

Adopt community-ansible-dev-tools image #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
30fdf88
Adopt community-ansible-dev-tools image
shatakshiiii Jul 11, 2024
4a7c190
Update test fixtures
shatakshiiii Jul 11, 2024
c60e6ef
Fix test_direct_interactive_ee for images
shatakshiiii Jul 12, 2024
52719d2
Fix test_direct_interactive_noee for images
shatakshiiii Jul 12, 2024
eaa570b
Fix welcome_interactive tests for images
shatakshiiii Jul 12, 2024
04cf154
fixture changes for tests failing on CI
shatakshiiii Jul 15, 2024
126096c
Test updates
cidrblock Jul 15, 2024
fb410d7
more test fixes
shatakshiiii Jul 15, 2024
396bda0
more test fixes: part2
shatakshiiii Jul 15, 2024
e9fc8e4
more test fixes: part3
shatakshiiii Jul 16, 2024
d550454
Merge branch 'main' into switch_to_new_adt_container
shatakshiiii Jul 16, 2024
e6d5faf
more test fixes: part4
shatakshiiii Jul 16, 2024
c30a9ca
more test fixes: part5
shatakshiiii Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ansible_navigator/data/images_dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is structured like a multi stage build

# The names ('as') need to correspond the the ImageEntry enum in utils/package_data.py
FROM ghcr.io/ansible/creator-ee:v24.2.0 as DEFAULT_EE
FROM ghcr.io/ansible/community-ansible-dev-tools:latest as DEFAULT_EE

# This is also hard coded in tests/fixtures/integration/execution_environment_image/ansible-navigator_set_ee_image.yml
FROM ghcr.io/ansible/creator-base:latest as SMALL_IMAGE
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
" 4│Ansible cow path True default None",
" 5│Ansible cow selection True default default",
" 6│Ansible force color True default False",
" 7│Ansible home True default /home/runner/.ansible",
" 7│Ansible home True default /root/.ansible",
" 8│Ansible nocolor True default False",
" 9│Ansible nocows True default False",
" 10│Ansible pipelining True default False",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/config/test_direct_interactive_ee.py/test/2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
" 2│current_value: 42",
" 3│default: false",
" 4│default_value: 86400",
" 5│description: Expiration timeout for the cache plugin data",
" 5│description: Expiration timeout for the cache plugin data.",
" 6│env:",
" 7│- name: ANSIBLE_CACHE_PLUGIN_TIMEOUT",
" 8│ini:",
Expand Down
2 changes: 1 addition & 1 deletion ...s/fixtures/integration/actions/config/test_direct_interactive_ee_using_cfg.py/test/0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
" 4│Ansible cow path True default None",
" 5│Ansible cow selection True default default",
" 6│Ansible force color True default False",
" 7│Ansible home True default /home/runner/.ansible",
" 7│Ansible home True default /root/.ansible",
" 8│Ansible nocolor True default False",
" 9│Ansible nocows True default False",
" 10│Ansible pipelining True default False",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
" 4│Ansible cow path True default None",
" 5│Ansible cow selection True default default",
" 6│Ansible force color True default False",
" 7│Ansible home True default /home/runner/.ansible",
" 7│Ansible home True default /root/.ansible",
" 8│Ansible nocolor True default False",
" 9│Ansible nocows True default False",
" 10│Ansible pipelining True default False",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/config/test_welcome_interactive_ee.py/test/3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
" 2│current_value: 42",
" 3│default: false",
" 4│default_value: 86400",
" 5│description: Expiration timeout for the cache plugin data",
" 5│description: Expiration timeout for the cache plugin data.",
" 6│env:",
" 7│- name: ANSIBLE_CACHE_PLUGIN_TIMEOUT",
" 8│ini:",
Expand Down
13 changes: 7 additions & 6 deletions ...ixtures/integration/actions/doc/test_direct_interactive_ee.py/test/filter_doc_pass/0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
" 7│ name: filter_1",
" 8│ notes:",
" 9│ - This is a dummy filter plugin",
"10│ short_description: This is test filter plugin",
"11│ version_added: 1.0.0",
"12│ version_added_collection: company_name.coll_1",
"13│examples: null",
"14│metadata: null",
"15│return: null",
"10│ plugin_name: company_name.coll_1.filter_1",
"11│ short_description: This is test filter plugin",
"12│ version_added: 1.0.0",
"13│ version_added_collection: company_name.coll_1",
"14│examples: null",
"15│metadata: null",
"16│return: null",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
27 changes: 14 additions & 13 deletions ...ixtures/integration/actions/doc/test_direct_interactive_ee.py/test/lookup_doc_pass/0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,20 @@
"18│ - Dummy option I(foo)",
"19│ required: true",
"20│ type: str",
"21│ plugin_type: lookup",
"22│ short_description: This is test lookup plugin",
"23│ version_added: 1.0.0",
"24│ version_added_collection: company_name.coll_1",
"25│examples: |-",
"26│ - name: Retrieve a value deep inside a using a path",
"27│ ansible.builtin.set_fact:",
"28│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"",
"29│metadata: null",
"30│return:",
"31│ _raw:",
"32│ description:",
"33│ - One or more zero-based indices of the matching list items.",
"21│ plugin_name: company_name.coll_1.lookup_1",
"22│ plugin_type: lookup",
"23│ short_description: This is test lookup plugin",
"24│ version_added: 1.0.0",
"25│ version_added_collection: company_name.coll_1",
"26│examples: |-",
"27│ - name: Retrieve a value deep inside a using a path",
"28│ ansible.builtin.set_fact:",
"29│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"",
"30│metadata: null",
"31│return:",
"32│ _raw:",
"33│ description:",
"34│ - One or more zero-based indices of the matching list items.",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
35 changes: 18 additions & 17 deletions ...ixtures/integration/actions/doc/test_direct_interactive_ee.py/test/module_doc_pass/0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,24 @@
"24│ description:",
"25│ - Dummy option I(foo)",
"26│ type: str",
"27│ short_description: This is a test module",
"28│ version_added: 1.0.0",
"29│ version_added_collection: company_name.coll_1",
"30│examples: |-",
"31│ - name: test task-1",
"32│ company_name.coll_1.mod_1:",
"33│ foo: somevalue",
"34│ bar: candidate",
"35│metadata: null",
"36│return:",
"37│ baz:",
"38│ description: test return 1",
"39│ returned: success",
"40│ sample:",
"41│ - a",
"42│ - b",
"43│ type: list",
"27│ plugin_name: company_name.coll_1.mod_1",
"28│ short_description: This is a test module",
"29│ version_added: 1.0.0",
"30│ version_added_collection: company_name.coll_1",
"31│examples: |-",
"32│ - name: test task-1",
"33│ company_name.coll_1.mod_1:",
"34│ foo: somevalue",
"35│ bar: candidate",
"36│metadata: null",
"37│return:",
"38│ baz:",
"39│ description: test return 1",
"40│ returned: success",
"41│ sample:",
"42│ - a",
"43│ - b",
"44│ type: list",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/integration/actions/doc/test_stdout.py/test/filter_doc_with_ee/0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
" \"notes\": [",
" \"This is a dummy filter plugin\"",
" ],",
" \"plugin_name\": \"company_name.coll_1.filter_1\",",
" \"short_description\": \"This is test filter plugin\",",
" \"version_added\": \"1.0.0\",",
" \"version_added_collection\": \"company_name.coll_1\"",
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/integration/actions/doc/test_stdout.py/test/lookup_doc_with_ee/0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
" \"type\": \"str\"",
" }",
" },",
" \"plugin_name\": \"company_name.coll_1.lookup_1\",",
" \"plugin_type\": \"lookup\",",
" \"short_description\": \"This is test lookup plugin\",",
" \"version_added\": \"1.0.0\",",
Expand Down
1 change: 1 addition & 0 deletions tests/fixtures/integration/actions/doc/test_stdout.py/test/module_doc_with_ee/0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
" \"type\": \"str\"",
" }",
" },",
" \"plugin_name\": \"company_name.coll_1.mod_1\",",
" \"short_description\": \"This is a test module\",",
" \"version_added\": \"1.0.0\",",
" \"version_added_collection\": \"company_name.coll_1\"",
Expand Down
13 changes: 7 additions & 6 deletions ...xtures/integration/actions/doc/test_welcome_interactive_ee.py/test/filter_doc_pass/1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@
" 7│ name: filter_1",
" 8│ notes:",
" 9│ - This is a dummy filter plugin",
"10│ short_description: This is test filter plugin",
"11│ version_added: 1.0.0",
"12│ version_added_collection: company_name.coll_1",
"13│examples: null",
"14│metadata: null",
"15│return: null",
"10│ plugin_name: company_name.coll_1.filter_1",
"11│ short_description: This is test filter plugin",
"12│ version_added: 1.0.0",
"13│ version_added_collection: company_name.coll_1",
"14│examples: null",
"15│metadata: null",
"16│return: null",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
27 changes: 14 additions & 13 deletions ...xtures/integration/actions/doc/test_welcome_interactive_ee.py/test/lookup_doc_pass/1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,20 @@
"18│ - Dummy option I(foo)",
"19│ required: true",
"20│ type: str",
"21│ plugin_type: lookup",
"22│ short_description: This is test lookup plugin",
"23│ version_added: 1.0.0",
"24│ version_added_collection: company_name.coll_1",
"25│examples: |-",
"26│ - name: Retrieve a value deep inside a using a path",
"27│ ansible.builtin.set_fact:",
"28│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"",
"29│metadata: null",
"30│return:",
"31│ _raw:",
"32│ description:",
"33│ - One or more zero-based indices of the matching list items.",
"21│ plugin_name: company_name.coll_1.lookup_1",
"22│ plugin_type: lookup",
"23│ short_description: This is test lookup plugin",
"24│ version_added: 1.0.0",
"25│ version_added_collection: company_name.coll_1",
"26│examples: |-",
"27│ - name: Retrieve a value deep inside a using a path",
"28│ ansible.builtin.set_fact:",
"29│ value: \"{{ lookup('company_name.coll_1.lookup_1', var1, var2) }}\"",
"30│metadata: null",
"31│return:",
"32│ _raw:",
"33│ description:",
"34│ - One or more zero-based indices of the matching list items.",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
35 changes: 18 additions & 17 deletions ...xtures/integration/actions/doc/test_welcome_interactive_ee.py/test/module_doc_pass/1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,24 @@
"24│ description:",
"25│ - Dummy option I(foo)",
"26│ type: str",
"27│ short_description: This is a test module",
"28│ version_added: 1.0.0",
"29│ version_added_collection: company_name.coll_1",
"30│examples: |-",
"31│ - name: test task-1",
"32│ company_name.coll_1.mod_1:",
"33│ foo: somevalue",
"34│ bar: candidate",
"35│metadata: null",
"36│return:",
"37│ baz:",
"38│ description: test return 1",
"39│ returned: success",
"40│ sample:",
"41│ - a",
"42│ - b",
"43│ type: list",
"27│ plugin_name: company_name.coll_1.mod_1",
"28│ short_description: This is a test module",
"29│ version_added: 1.0.0",
"30│ version_added_collection: company_name.coll_1",
"31│examples: |-",
"32│ - name: test task-1",
"33│ company_name.coll_1.mod_1:",
"34│ foo: somevalue",
"35│ bar: candidate",
"36│metadata: null",
"37│return:",
"38│ baz:",
"39│ description: test return 1",
"40│ returned: success",
"41│ sample:",
"42│ - a",
"43│ - b",
"44│ type: list",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back :help help"
]
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"comment": "ansible-navigator images top window",
"additional_information": {
"present": [
"v24.2.0"
"community-ansible-dev-tools"
],
"absent": [],
"compared_fixture": false
},
"output": [
" Image Tag Execution environment Created Size",
"0│creator-base latest False some time ago 341 MB",
"1│creator-ee v24.2.0 True 5 weeks ago 686 MB",
"1│community-ansible-dev-tools latest True 5 weeks ago 686 MB",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help"
]
}
8 changes: 4 additions & 4 deletions tests/fixtures/integration/actions/images/test_direct_interactive_ee.py/test/1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "test[01-:f v24.2.0-filter for v24.2.0]",
"name": "test[01-:f latest-filter for latest]",
"index": 1,
"comment": "filter for v24.2.0",
"comment": "filter for latest",
"additional_information": {
"present": [
"v24.2.0"
"latest"
],
"absent": [],
"compared_fixture": false
},
"output": [
" Image Tag Execution environment Created Size",
"0│creator-ee v24.2.0 True 5 weeks ago 686 MB",
"0│community-ansible-dev-tools latest True 5 weeks ago 686 MB",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help"
]
}
Loading
Loading