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

Second part of refactoring for downstream CI #392

Merged
merged 2 commits into from
Aug 12, 2024
Merged

Second part of refactoring for downstream CI #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4dac91
refactoring for aap second part
prabinovRedhat Aug 7, 2024
d2810b2
fix target names in the paths
prabinovRedhat Aug 7, 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
28 changes: 14 additions & 14 deletions .github/workflows/integration_source.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,20 +146,20 @@ jobs:
run: ansible-test integration itsm_api_generic
working-directory: ${{ steps.identify.outputs.collection_path }}

- name: Run attachment integration tests
run: ansible-test integration attachment
- name: Run itsm_attachment integration tests
run: ansible-test integration itsm_attachment
working-directory: ${{ steps.identify.outputs.collection_path }}

- name: Run attachment_info integration tests
run: ansible-test integration attachment_info
- name: Run itsm_attachment_info integration tests
run: ansible-test integration itsm_attachment_info
working-directory: ${{ steps.identify.outputs.collection_path }}

- name: Run attachment_upload integration tests
run: ansible-test integration attachment_upload
- name: Run itsm_attachment_upload integration tests
run: ansible-test integration itsm_attachment_upload
working-directory: ${{ steps.identify.outputs.collection_path }}

- name: Run change_request integration tests
run: ansible-test integration change_request
- name: Run itsm_change_request integration tests
run: ansible-test integration itsm_change_request
working-directory: ${{ steps.identify.outputs.collection_path }}

- name: Run itsm_change_request_task integration tests
Expand All @@ -170,12 +170,12 @@ jobs:
run: ansible-test integration itsm_change_request_with_mapping
working-directory: ${{ steps.identify.outputs.collection_path }}

- name: Run configuration_item integration tests
run: ansible-test integration configuration_item
- name: Run itsm_configuration_item integration tests
run: ansible-test integration itsm_configuration_item
working-directory: ${{ steps.identify.outputs.collection_path }}

- name: Run configuration_item_batch integration tests
run: ansible-test integration configuration_item_batch
- name: Run itsm_configuration_item_batch integration tests
run: ansible-test integration itsm_configuration_item_batch
working-directory: ${{ steps.identify.outputs.collection_path }}

- name: Run itsm_configuration_item_relations integration tests
Expand All @@ -186,6 +186,6 @@ jobs:
run: ansible-test integration itsm_service_catalog_info
working-directory: ${{ steps.identify.outputs.collection_path }}

- name: Run service_catalog integration tests
run: ansible-test integration service_catalog
- name: Run itsm_service_catalog integration tests
run: ansible-test integration itsm_service_catalog
working-directory: ${{ steps.identify.outputs.collection_path }}
0 ...n/targets/attachment/res/sample_file1.txt → ...gets/itsm_attachment/res/sample_file1.txt
View file
Open in desktop
File renamed without changes.
0 ...n/targets/attachment/res/sample_file2.txt → ...gets/itsm_attachment/res/sample_file2.txt
View file
Open in desktop
File renamed without changes.
32 changes: 16 additions & 16 deletions ...gration/targets/attachment/tasks/main.yml → ...on/targets/itsm_attachment/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
risk: low
impact: low
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
check_mode: true
register: result

Expand Down Expand Up @@ -49,9 +49,9 @@
servicenow.itsm.change_request: &cr-update
number: "{{ test_result.record.number }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
name: sample_file1.txt
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
name: sample_file2.txt
check_mode: true
register: result
Expand All @@ -78,7 +78,7 @@
servicenow.itsm.change_request:
number: "{{ test_result.record.number }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file2.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file2.txt"
name: sample_file1.txt
register: result

Expand Down Expand Up @@ -130,7 +130,7 @@
install_status: on_order
operational_status: non_operational
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
check_mode: true
register: ci_result

Expand Down Expand Up @@ -158,9 +158,9 @@
servicenow.itsm.configuration_item: &ci-update
sys_id: "{{ test_result.record.sys_id }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
name: sample_file1.txt
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
name: sample_file2.txt
check_mode: true
register: result
Expand All @@ -187,7 +187,7 @@
servicenow.itsm.configuration_item:
sys_id: "{{ test_result.record.sys_id }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file2.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file2.txt"
name: sample_file1.txt
register: result

Expand Down Expand Up @@ -240,7 +240,7 @@
impact: low
urgency: low
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
check_mode: true
register: result

Expand Down Expand Up @@ -268,9 +268,9 @@
servicenow.itsm.incident: &incident-update
number: "{{ test_result.record.number }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
name: sample_file1.txt
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
name: sample_file2.txt
check_mode: true
register: result
Expand All @@ -297,7 +297,7 @@
servicenow.itsm.incident:
number: "{{ test_result.record.number }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file2.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file2.txt"
name: sample_file1.txt
register: result

Expand Down Expand Up @@ -346,7 +346,7 @@
short_description: my-problem
state: new
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
register: first_problem
check_mode: true

Expand All @@ -370,9 +370,9 @@
servicenow.itsm.problem: &problem-update
sys_id: "{{ first_problem.record.sys_id }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
name: sample_file1.txt
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file1.txt"
name: sample_file2.txt
check_mode: true
register: result
Expand All @@ -399,7 +399,7 @@
servicenow.itsm.problem:
sys_id: "{{ first_problem.record.sys_id }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment/res/sample_file2.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment/res/sample_file2.txt"
name: sample_file1.txt
register: result

Expand Down
0 ...gets/attachment_info/res/sample_file1.txt → ...itsm_attachment_info/res/sample_file1.txt
View file
Open in desktop
File renamed without changes.
0 ...gets/attachment_info/res/sample_file2.txt → ...itsm_attachment_info/res/sample_file2.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...on/targets/attachment_info/tasks/main.yml → ...rgets/itsm_attachment_info/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
impact: low
urgency: low
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment_info/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_info/res/sample_file1.txt"
register: test_incident

- ansible.builtin.assert:
Expand Down
0 ...ts/attachment_upload/res/sample_file1.txt → ...sm_attachment_upload/res/sample_file1.txt
View file
Open in desktop
File renamed without changes.
0 ...ts/attachment_upload/res/sample_file2.txt → ...sm_attachment_upload/res/sample_file2.txt
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions .../targets/attachment_upload/tasks/main.yml → ...ets/itsm_attachment_upload/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
impact: low
urgency: low
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file1.txt"
register: test_incident

- ansible.builtin.assert:
Expand All @@ -33,7 +33,7 @@
table_name: incident
table_sys_id: "{{ test_incident.record.sys_id }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file1.txt"
name: sample_file1.txt
register: result

Expand All @@ -52,7 +52,7 @@
table_name: incident
table_sys_id: "{{ test_incident.record.sys_id }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file2.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt"
name: sample_file2.txt
check_mode: true
register: result
Expand Down Expand Up @@ -92,7 +92,7 @@
table_name: incident
table_sys_id: "{{ test_incident.record.sys_id }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file2.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt"
name: sample_file1.txt
register: result

Expand All @@ -111,9 +111,9 @@
table_name: incident
table_sys_id: "{{ test_incident.record.sys_id }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file2.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt"
name: sample_file1.txt
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file1.txt"
name: sample_file
register: result

Expand All @@ -132,11 +132,11 @@
table_name: incident
table_sys_id: "{{ test_incident.record.sys_id }}"
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file1.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file1.txt"
name: sample_file1.txt # to be updated
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file2.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt"
name: sample_file2.txt # no update
- path: "{{ collection_base_dir }}/tests/integration/targets/attachment_upload/res/sample_file2.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_attachment_upload/res/sample_file2.txt"
name: sample_file3.txt # new
register: result

Expand Down
0 ...argets/change_request/res/sample_file.txt → ...s/itsm_change_request/res/sample_file.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ion/targets/change_request/tasks/main.yml → ...argets/itsm_change_request/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
impact: low
short_description: some short description
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/change_request/res/sample_file.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_change_request/res/sample_file.txt"
check_mode: true
register: result

Expand Down
0 ...ts/configuration_item/res/sample_file.txt → ...sm_configuration_item/res/sample_file.txt
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...targets/configuration_item/tasks/main.yml → ...ts/itsm_configuration_item/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
install_status: on_order
operational_status: non_operational
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/configuration_item/res/sample_file.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_configuration_item/res/sample_file.txt"
register: base_ci
check_mode: true

Expand Down Expand Up @@ -320,7 +320,7 @@
install_status: on_order
operational_status: non_operational
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/configuration_item/res/sample_file.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_configuration_item/res/sample_file.txt"
register: base_ci

- name: Get info and select only name
Expand Down
0 ...s/configuration_item_batch/tasks/main.yml → ...m_configuration_item_batch/tasks/main.yml
View file
Open in desktop
File renamed without changes.
0 ...tion/targets/incident/res/sample_file.txt → ...targets/itsm_incident/res/sample_file.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tegration/targets/incident/tasks/main.yml → ...tion/targets/itsm_incident/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
impact: low
urgency: low
attachments:
- path: "{{ collection_base_dir }}/tests/integration/targets/incident/res/sample_file.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_incident/res/sample_file.txt"
check_mode: true
register: result

Expand Down
0 ...incident_with_mapping/res/sample_file.txt → ...incident_with_mapping/res/sample_file.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...gets/incident_with_mapping/tasks/main.yml → ...itsm_incident_with_mapping/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
impact: low
urgency: low
attachments:
- path: "{{ collection_base_dir }}/targets/incident_with_mapping/res/sample_file.txt"
- path: "{{ collection_base_dir }}/tests/integration/targets/itsm_incident_with_mapping/res/sample_file.txt"
check_mode: true
register: result

Expand Down
0 ...on/targets/service_catalog/tasks/main.yml → ...rgets/itsm_service_catalog/tasks/main.yml
View file
Open in desktop
File renamed without changes.
Loading