Fix tailing newline by not created it in the first place

This commit is contained in:
Laurent Indermuehle 2023-01-05 19:44:22 +01:00
commit 42fe4baf18
No known key found for this signature in database
GPG key ID: 93FA944C9F34DD09
3 changed files with 8 additions and 8 deletions

View file

@ -125,9 +125,9 @@ jobs:
ansible-core-version: ${{ matrix.ansible }} ansible-core-version: ${{ matrix.ansible }}
pre-test-cmd: >- pre-test-cmd: >-
>&2 echo Setting db_engine_version to ${{ matrix.db_engine_version }}...; >&2 echo Setting db_engine_version to ${{ matrix.db_engine_version }}...;
echo "${{ matrix.db_engine_version }}" > tests/integration/db_engine_version; echo -n "${{ matrix.db_engine_version }}" > tests/integration/db_engine_version;
>&2 echo Setting Connector version to ${{ matrix.connector }}...; >&2 echo Setting Connector version to ${{ matrix.connector }}...;
echo "${{ matrix.connector }}" > tests/integration/connector echo -n "${{ matrix.connector }}" > tests/integration/connector
target-python-version: ${{ matrix.python }} target-python-version: ${{ matrix.python }}
testing-type: integration testing-type: integration

View file

@ -1,7 +1,7 @@
.PHONY: test-integration .PHONY: test-integration
test-integration: test-integration:
echo "mysql:8.0.22" > tests/integration/db_engine_version echo -n "mysql:8.0.22" > tests/integration/db_engine_version
echo "pymysql==0.9.3" > tests/integration/connector echo -n "pymysql==0.9.3" > tests/integration/connector
podman run \ podman run \
--detach \ --detach \
--name primary \ --name primary \

View file

@ -12,18 +12,18 @@
{{ lookup( {{ lookup(
'file', 'file',
'/root/ansible_collections/community/mysql/tests/integration/connector' '/root/ansible_collections/community/mysql/tests/integration/connector'
) | trim }} ) }}
db_engine_version: > db_engine_version: >
{{ lookup( {{ lookup(
'file', 'file',
'/root/ansible_collections/community/mysql/tests/integration/db_engine_version' '/root/ansible_collections/community/mysql/tests/integration/db_engine_version'
) | trim }}" ) }}"
- name: "{{ role_name }} | Setvars | Set Fact using above facts" - name: "{{ role_name }} | Setvars | Set Fact using above facts"
ansible.builtin.set_fact: ansible.builtin.set_fact:
connector_ver: "{{ connector_name.split('=')[2].strip() }}" connector_ver: "{{ connector_name.split('=')[2].strip() }}"
db_engine: "{{ db_engine_version | split(':') | first }}" db_engine: "{{ db_engine_version.split(':')[0].strip() }}"
db_version: "{{ db_engine_version | split(':') | last }}" db_version: "{{ db_engine_version.split(':')[1].strip() }}"
mysql_command: >- mysql_command: >-
mysql mysql
-h{{ gateway_addr }} -h{{ gateway_addr }}