Skip to content

Commit

Permalink
Switch to adt container
Browse files Browse the repository at this point in the history
  • Loading branch information
@shatakshiiii
shatakshiiii committed Jul 3, 2024
1 parent 084e6e8 commit 21c56c8
Show file tree
Hide file tree
Showing 22 changed files with 38 additions and 37 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
default_language_version:
# ensures that we get same behavior on CI(s) as on local machines
python: python3.11
python: python3.12
exclude: >
(?x)^(
_readthedocs|
Expand Down
3 changes: 2 additions & 1 deletion src/ansible_navigator/data/images_dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# 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/creator-ee:v24.2.0 as DEFAULT_EE
FROM ghcr.io/ansible/community-ansible-dev-tools:v24.6.1 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
4 changes: 2 additions & 2 deletions tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/0.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"comment": "print image to stdout",
"additional_information": {
"present": [
"repository: ghcr.io/ansible/creator-ee"
"repository: ghcr.io/ansible/community-ansible-dev-tools"
],
"absent": [],
"compared_fixture": false
Expand All @@ -28,7 +28,7 @@
" - ghcr.io/ansible/creator-ee:v24.2.0",
" name: creator-ee",
" name_tag: creator-ee:v24.2.0(primary)",
" repository: ghcr.io/ansible/creator-ee",
" repository: ghcr.io/ansible/community-ansible-dev-tools",
"(venv) bash$"
]
}
4 changes: 2 additions & 2 deletions tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"present": [
"ansible_collections",
"ansible_version",
"image_name: ghcr.io/ansible/creator-ee:v24.2.0",
"image_name: ghcr.io/ansible/community-ansible-dev-tools:v24.6.1",
"os_release",
"python_packages",
"python_version",
Expand All @@ -19,7 +19,7 @@
"output": [
"ansible_collections:",
"ansible_version:",
"image_name: ghcr.io/ansible/creator-ee:v24.2.0",
"image_name: ghcr.io/ansible/community-ansible-dev-tools:v24.6.1",
"os_release:",
"python_packages:",
"python_version:",
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"present": [
"ansible_collections",
"ansible_version",
"image_name: ghcr.io/ansible/creator-ee:v24.2.0"
"image_name: ghcr.io/ansible/community-ansible-dev-tools:v24.6.1"
],
"absent": [
"os_release",
Expand All @@ -20,7 +20,7 @@
"output": [
"ansible_collections:",
"ansible_version:",
"image_name: ghcr.io/ansible/creator-ee:v24.2.0",
"image_name: ghcr.io/ansible/community-ansible-dev-tools:v24.6.1",
"(venv) bash$"
]
}
4 changes: 2 additions & 2 deletions tests/fixtures/integration/actions/images/test_stdout_tmux.py/test/4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"comment": "print image details as json output",
"additional_information": {
"present": [
"\"name\": \"creator-ee\""
"\"name\": \"community-ansible-dev-tools\""
],
"absent": [],
"compared_fixture": false
Expand All @@ -26,7 +26,7 @@
" \"ghcr.io/ansible/creator-ee@sha256:39fd2060b7fb2f987835057e50a9ee1c1290d525e43aafbdcd1461f76c46a770\",",
" \"ghcr.io/ansible/creator-ee@sha256:de0ae709f909b17e5f5f8ca5e1656ee427e2a01c7e1e74be314dc989edf47a49\"",
" \"ghcr.io/ansible/creator-ee:v24.2.0\"",
" \"name\": \"creator-ee\",",
" \"name\": \"community-ansible-dev-tools\",",
" \"name_tag\": \"creator-ee:v24.2.0 (primary)\",",
" \"repository\": \"ghcr.io/ansible/creator-ee\",",
"(venv) bash$"
Expand Down
4 changes: 2 additions & 2 deletions tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/1.json
View file
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"
"v24.6.1"
],
"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 v24.6.1 True 5 weeks ago 686 MB",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help"
]
}
4 changes: 2 additions & 2 deletions tests/fixtures/integration/actions/images/test_welcome_interactive_ee.py/test/2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"comment": "filter for v24.2.0",
"additional_information": {
"present": [
"v24.2.0"
"v24.6.1"
],
"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 v24.6.1 True 5 weeks ago 686 MB",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help"
]
}
4 changes: 2 additions & 2 deletions tests/fixtures/integration/actions/images/test_welcome_interactive_noee.py/test/2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"comment": "filter for v24.2.0",
"additional_information": {
"present": [
"v24.2.0"
"v24.6.1"
],
"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 v24.6.1 True 5 weeks ago 686 MB",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help"
]
}
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"0│Exec command True Defaults /bin/bash",
"1│Exec shell True Defaults True",
"2│Execution environment True Command line True",
"3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0",
"3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:v24.6.1",
"4│Execution environment volume mounts True Not set Not set",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help"
]
Expand Down
6 changes: 3 additions & 3 deletions tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
"compared_fixture": true
},
"output": [
"Execution environment image (current value/default value: ghcr.io/ansible/creator-ee:v24.2.0)",
"Execution environment image (current value/default value: ghcr.io/ansible/community-ansible-dev-tools:v24.6.1)",
" 0│--- ▒",
" 1│choices: [] ▒",
" 2│cli_parameters: ▒",
" 3│ long: --execution-environment-image ▒",
" 4│ short: --eei ▒",
" 5│current_settings_file: None ▒",
" 6│current_value: ghcr.io/ansible/creator-ee:v24.2.0 ▒",
" 6│current_value: ghcr.io/ansible/community-ansible-dev-tools:v24.6.1 ▒",
" 7│default: true ▒",
" 8│default_value: ghcr.io/ansible/creator-ee:v24.2.0 ▒",
" 8│default_value: ghcr.io/ansible/community-ansible-dev-tools:v24.6.1 ▒",
" 9│description: Specify the name of the execution environment image ▒",
"10│env_var: ANSIBLE_NAVIGATOR_EXECUTION_ENVIRONMENT_IMAGE ▒",
"11│name: Execution environment image ▒",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/7.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"0│Exec command True Defaults /bin/bash",
"1│Exec shell True Defaults True",
"2│Execution environment True Command line True",
"3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0",
"3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:v24.6.1",
"4│Execution environment volume mounts True Not set Not set",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help"
]
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/settings/test_direct_interactive_ee.py/test/8.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"15│Exec command True Defaults /bin/bash",
"16│Exec shell True Defaults True",
"17│Execution environment True Command line True",
"18│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0",
"18│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:v24.6.1",
"19│Execution environment volume mounts True Not set Not set",
"20│Format True Defaults yaml",
"21│Help builder True Defaults False",
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/integration/actions/settings/test_direct_interactive_noee.py/test/5.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"0│Exec command True Defaults /bin/bash",
"1│Exec shell True Defaults True",
"2│Execution environment False Command line False",
"3│Execution environment image True Defaults ghcr.io/ansible/creator-ee:v24.2.0",
"3│Execution environment image True Defaults ghcr.io/ansible/community-ansible-dev-tools:v24.6.1",
"4│Execution environment volume mounts True Not set Not set",
"^b/PgUp page up ^f/PgDn page down ↑↓ scroll esc back [0-9] goto :help help"
]
Expand Down
Loading

0 comments on commit 21c56c8

Please sign in to comment.