Clean up Scriptorium review findings
This commit is contained in:
@@ -77,5 +77,3 @@ directory, then restores the default deployment during cleanup.
|
|||||||
```sh
|
```sh
|
||||||
tests/integration
|
tests/integration
|
||||||
```
|
```
|
||||||
|
|
||||||
Ansible role to install the Scriptorium application.
|
|
||||||
|
|||||||
@@ -83,17 +83,16 @@ run_converge "$recovery_repeat_log" \
|
|||||||
-e "scriptorium_go_binary=$custom_go_binary"
|
-e "scriptorium_go_binary=$custom_go_binary"
|
||||||
require_clean_recap "$recovery_repeat_log"
|
require_clean_recap "$recovery_repeat_log"
|
||||||
|
|
||||||
representative_log="$test_tmp/representative.log"
|
representative_args=(
|
||||||
run_converge "$representative_log" \
|
-e "scriptorium_profile_dir=$profile_dir"
|
||||||
-e "scriptorium_profile_dir=$profile_dir" \
|
-e 'scriptorium_server_addr=127.0.0.1:18080'
|
||||||
-e 'scriptorium_server_addr=127.0.0.1:18080' \
|
|
||||||
-e '{"scriptorium_server_max_request_bytes": 0, "scriptorium_server_artifact_root": null, "scriptorium_schema_dir": null, "scriptorium_defaults_render_format": "json", "scriptorium_backends": {"fixture-backend": {"endpoint": "http://127.0.0.1:8000/v1", "concurrency_limit": 1, "queue_capacity": 0, "extra_params": {"stream": false}}}}'
|
-e '{"scriptorium_server_max_request_bytes": 0, "scriptorium_server_artifact_root": null, "scriptorium_schema_dir": null, "scriptorium_defaults_render_format": "json", "scriptorium_backends": {"fixture-backend": {"endpoint": "http://127.0.0.1:8000/v1", "concurrency_limit": 1, "queue_capacity": 0, "extra_params": {"stream": false}}}}'
|
||||||
|
)
|
||||||
|
representative_log="$test_tmp/representative.log"
|
||||||
|
run_converge "$representative_log" "${representative_args[@]}"
|
||||||
"$binary_path" inspect profile --config "$config_path" --profile backend-profile
|
"$binary_path" inspect profile --config "$config_path" --profile backend-profile
|
||||||
"$ansible_playbook" -i "$inventory" \
|
"$ansible_playbook" -i "$inventory" \
|
||||||
-e "scriptorium_test_profile_dir=$profile_dir" "$verify_config"
|
-e "scriptorium_test_profile_dir=$profile_dir" "$verify_config"
|
||||||
representative_repeat_log="$test_tmp/representative-repeat.log"
|
representative_repeat_log="$test_tmp/representative-repeat.log"
|
||||||
run_converge "$representative_repeat_log" \
|
run_converge "$representative_repeat_log" "${representative_args[@]}"
|
||||||
-e "scriptorium_profile_dir=$profile_dir" \
|
|
||||||
-e 'scriptorium_server_addr=127.0.0.1:18080' \
|
|
||||||
-e '{"scriptorium_server_max_request_bytes": 0, "scriptorium_server_artifact_root": null, "scriptorium_schema_dir": null, "scriptorium_defaults_render_format": "json", "scriptorium_backends": {"fixture-backend": {"endpoint": "http://127.0.0.1:8000/v1", "concurrency_limit": 1, "queue_capacity": 0, "extra_params": {"stream": false}}}}'
|
|
||||||
require_clean_recap "$representative_repeat_log"
|
require_clean_recap "$representative_repeat_log"
|
||||||
|
|||||||
@@ -10,10 +10,6 @@
|
|||||||
src: "{{ scriptorium_config_path }}"
|
src: "{{ scriptorium_config_path }}"
|
||||||
register: scriptorium_config_file
|
register: scriptorium_config_file
|
||||||
|
|
||||||
- name: Parse the managed configuration
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
scriptorium_config: "{{ scriptorium_config_file.content | b64decode | from_yaml }}"
|
|
||||||
|
|
||||||
- name: Verify representative configuration mappings
|
- name: Verify representative configuration mappings
|
||||||
ansible.builtin.assert:
|
ansible.builtin.assert:
|
||||||
that:
|
that:
|
||||||
@@ -29,3 +25,5 @@
|
|||||||
- scriptorium_config.backends["fixture-backend"].concurrency_limit == 1
|
- scriptorium_config.backends["fixture-backend"].concurrency_limit == 1
|
||||||
- scriptorium_config.backends["fixture-backend"].queue_capacity == 0
|
- scriptorium_config.backends["fixture-backend"].queue_capacity == 0
|
||||||
- scriptorium_config.backends["fixture-backend"].extra_params.stream == false
|
- scriptorium_config.backends["fixture-backend"].extra_params.stream == false
|
||||||
|
vars:
|
||||||
|
scriptorium_config: "{{ scriptorium_config_file.content | b64decode | from_yaml }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user