From db4abc39da87c29be1f58cc354bd7701e8ae03ac Mon Sep 17 00:00:00 2001 From: Rene Moser Date: Fri, 29 Nov 2024 16:58:43 +0100 Subject: [PATCH] rm group3 --- .github/workflows/integration-changed.yml | 75 ------------------- .github/workflows/integration.yml | 7 +- tests/integration/targets/account/aliases | 1 - .../targets/affinity_group/aliases | 1 - tests/integration/targets/cluster/aliases | 1 - .../integration/targets/configuration/aliases | 1 - .../targets/configuration_info/aliases | 1 - .../integration/targets/disk_offering/aliases | 1 - tests/integration/targets/domain/aliases | 1 - tests/integration/targets/firewall/aliases | 1 - tests/integration/targets/host/aliases | 1 - tests/integration/targets/image_store/aliases | 1 - tests/integration/targets/instance/aliases | 1 - .../targets/instance_group/aliases | 1 - .../integration/targets/instance_info/aliases | 1 - .../integration/targets/instance_nic/aliases | 1 - .../targets/instance_nic_secondaryip/aliases | 1 - .../targets/instance_password_reset/aliases | 1 - .../targets/instance_snapshot/aliases | 1 - .../targets/inventory_instance/aliases | 1 - tests/integration/targets/ip_address/aliases | 1 - tests/integration/targets/iso/aliases | 1 - tests/integration/targets/lb_rule/aliases | 1 - tests/integration/targets/network/aliases | 1 - tests/integration/targets/network_acl/aliases | 1 - .../targets/network_acl_rule/aliases | 1 - .../targets/network_offering/aliases | 1 - .../targets/physical_network/aliases | 1 - tests/integration/targets/pod/aliases | 1 - tests/integration/targets/portforward/aliases | 1 - tests/integration/targets/project/aliases | 1 - tests/integration/targets/region/aliases | 1 - .../targets/resource_limit/aliases | 1 - tests/integration/targets/role/aliases | 1 - .../targets/role_permission/aliases | 1 - tests/integration/targets/router/aliases | 1 - .../targets/security_group/aliases | 1 - .../targets/security_group_rule/aliases | 1 - .../targets/service_offering/aliases | 1 - tests/integration/targets/ssh_key/aliases | 1 - .../integration/targets/storage_pool/aliases | 1 - tests/integration/targets/template/aliases | 1 - .../integration/targets/traffic_type/aliases | 1 - tests/integration/targets/user/aliases | 1 - .../integration/targets/vlan_ip_range/aliases | 1 - tests/integration/targets/volume/aliases | 1 - .../targets/volume_snapshot_policy/aliases | 1 - tests/integration/targets/vpc/aliases | 1 - .../integration/targets/vpc_offering/aliases | 1 - .../targets/vpn_connection/aliases | 1 - .../targets/vpn_customer_gateway/aliases | 1 - tests/integration/targets/vpn_gateway/aliases | 1 - tests/integration/targets/zone/aliases | 1 - tests/integration/targets/zone_info/aliases | 1 - 54 files changed, 2 insertions(+), 132 deletions(-) delete mode 100644 .github/workflows/integration-changed.yml diff --git a/.github/workflows/integration-changed.yml b/.github/workflows/integration-changed.yml deleted file mode 100644 index 14de20b5..00000000 --- a/.github/workflows/integration-changed.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: Collection integration of changed - -on: - pull_request: - paths: - - "plugins/**" - - "tests/integration/**" - -jobs: - integration-test: - name: Integration of changes v${{ matrix.container-version }} Ansible-${{ matrix.ansible-branch }} Py${{ matrix.python-version }} - defaults: - run: - working-directory: ansible_collections/ngine_io/cloudstack - runs-on: ubuntu-latest - strategy: - max-parallel: 1 - fail-fast: false - matrix: - python-version: - - "3.11" - ansible-branch: - - stable-2.17 - group: - - 3 - container-version: - - 1.7.0 - steps: - - name: Check out code - uses: actions/checkout@v4 - with: - path: ansible_collections/ngine_io/cloudstack - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - - name: Install ansible and collection dependencies - run: | - python -m pip install --upgrade pip - pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible-branch }}.tar.gz - pip install -r requirements.txt - - - name: Build and install collection - run: | - ansible-galaxy collection build . - ansible-galaxy collection install *.gz - - - name: Run the tests - run: >- - ansible-test - integration - --docker - -v - --continue-on-error - --diff - --color - --python ${{ matrix.python-version }} - --coverage - cs/group${{ matrix.group }}/ - env: - ANSIBLE_CLOUDSTACK_CONTAINER: quay.io/ansible/cloudstack-test-container:${{ matrix.container-version }} - - - name: Generate coverage report. - run: >- - ansible-test - coverage xml - -v - --requirements - --group-by command - --group-by version - - uses: codecov/codecov-action@v4 - with: - fail_ci_if_error: false diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 6c8f2b2f..3a0b490a 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -4,8 +4,6 @@ on: pull_request: types: [labeled] push: - branches: - - master paths: - "plugins/**" - "tests/integration/**" @@ -32,7 +30,7 @@ jobs: - stable-2.17 container-version: - 1.6.1 - - 1.4.0 + - 1.7.0 steps: - name: Check out code uses: actions/checkout@v4 @@ -63,11 +61,10 @@ jobs: -v --diff --color - --retry-on-error --python ${{ matrix.python-version }} --continue-on-error --coverage - shippable/cs/group${{ matrix.group }}/ + cs/group${{ matrix.group }}/ env: ANSIBLE_CLOUDSTACK_CONTAINER: quay.io/ansible/cloudstack-test-container:${{ matrix.container-version }} diff --git a/tests/integration/targets/account/aliases b/tests/integration/targets/account/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/account/aliases +++ b/tests/integration/targets/account/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/affinity_group/aliases b/tests/integration/targets/affinity_group/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/affinity_group/aliases +++ b/tests/integration/targets/affinity_group/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/cluster/aliases b/tests/integration/targets/cluster/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/cluster/aliases +++ b/tests/integration/targets/cluster/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/configuration/aliases b/tests/integration/targets/configuration/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/configuration/aliases +++ b/tests/integration/targets/configuration/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/configuration_info/aliases b/tests/integration/targets/configuration_info/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/configuration_info/aliases +++ b/tests/integration/targets/configuration_info/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/disk_offering/aliases b/tests/integration/targets/disk_offering/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/disk_offering/aliases +++ b/tests/integration/targets/disk_offering/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/domain/aliases b/tests/integration/targets/domain/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/domain/aliases +++ b/tests/integration/targets/domain/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/firewall/aliases b/tests/integration/targets/firewall/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/firewall/aliases +++ b/tests/integration/targets/firewall/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/host/aliases b/tests/integration/targets/host/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/host/aliases +++ b/tests/integration/targets/host/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/image_store/aliases b/tests/integration/targets/image_store/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/image_store/aliases +++ b/tests/integration/targets/image_store/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/instance/aliases b/tests/integration/targets/instance/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/instance/aliases +++ b/tests/integration/targets/instance/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/instance_group/aliases b/tests/integration/targets/instance_group/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/instance_group/aliases +++ b/tests/integration/targets/instance_group/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/instance_info/aliases b/tests/integration/targets/instance_info/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/instance_info/aliases +++ b/tests/integration/targets/instance_info/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/instance_nic/aliases b/tests/integration/targets/instance_nic/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/instance_nic/aliases +++ b/tests/integration/targets/instance_nic/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/instance_nic_secondaryip/aliases b/tests/integration/targets/instance_nic_secondaryip/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/instance_nic_secondaryip/aliases +++ b/tests/integration/targets/instance_nic_secondaryip/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/instance_password_reset/aliases b/tests/integration/targets/instance_password_reset/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/instance_password_reset/aliases +++ b/tests/integration/targets/instance_password_reset/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/instance_snapshot/aliases b/tests/integration/targets/instance_snapshot/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/instance_snapshot/aliases +++ b/tests/integration/targets/instance_snapshot/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/inventory_instance/aliases b/tests/integration/targets/inventory_instance/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/inventory_instance/aliases +++ b/tests/integration/targets/inventory_instance/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/ip_address/aliases b/tests/integration/targets/ip_address/aliases index 594edd0d..1a87ee60 100644 --- a/tests/integration/targets/ip_address/aliases +++ b/tests/integration/targets/ip_address/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3i diff --git a/tests/integration/targets/iso/aliases b/tests/integration/targets/iso/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/iso/aliases +++ b/tests/integration/targets/iso/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/lb_rule/aliases b/tests/integration/targets/lb_rule/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/lb_rule/aliases +++ b/tests/integration/targets/lb_rule/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/network/aliases b/tests/integration/targets/network/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/network/aliases +++ b/tests/integration/targets/network/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/network_acl/aliases b/tests/integration/targets/network_acl/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/network_acl/aliases +++ b/tests/integration/targets/network_acl/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/network_acl_rule/aliases b/tests/integration/targets/network_acl_rule/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/network_acl_rule/aliases +++ b/tests/integration/targets/network_acl_rule/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/network_offering/aliases b/tests/integration/targets/network_offering/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/network_offering/aliases +++ b/tests/integration/targets/network_offering/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/physical_network/aliases b/tests/integration/targets/physical_network/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/physical_network/aliases +++ b/tests/integration/targets/physical_network/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/pod/aliases b/tests/integration/targets/pod/aliases index 2ce8657c..1a87ee60 100644 --- a/tests/integration/targets/pod/aliases +++ b/tests/integration/targets/pod/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group1 -cs/group3 diff --git a/tests/integration/targets/portforward/aliases b/tests/integration/targets/portforward/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/portforward/aliases +++ b/tests/integration/targets/portforward/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/project/aliases b/tests/integration/targets/project/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/project/aliases +++ b/tests/integration/targets/project/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/region/aliases b/tests/integration/targets/region/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/region/aliases +++ b/tests/integration/targets/region/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/resource_limit/aliases b/tests/integration/targets/resource_limit/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/resource_limit/aliases +++ b/tests/integration/targets/resource_limit/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/role/aliases b/tests/integration/targets/role/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/role/aliases +++ b/tests/integration/targets/role/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/role_permission/aliases b/tests/integration/targets/role_permission/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/role_permission/aliases +++ b/tests/integration/targets/role_permission/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/router/aliases b/tests/integration/targets/router/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/router/aliases +++ b/tests/integration/targets/router/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/security_group/aliases b/tests/integration/targets/security_group/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/security_group/aliases +++ b/tests/integration/targets/security_group/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/security_group_rule/aliases b/tests/integration/targets/security_group_rule/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/security_group_rule/aliases +++ b/tests/integration/targets/security_group_rule/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/service_offering/aliases b/tests/integration/targets/service_offering/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/service_offering/aliases +++ b/tests/integration/targets/service_offering/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/ssh_key/aliases b/tests/integration/targets/ssh_key/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/ssh_key/aliases +++ b/tests/integration/targets/ssh_key/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/storage_pool/aliases b/tests/integration/targets/storage_pool/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/storage_pool/aliases +++ b/tests/integration/targets/storage_pool/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/template/aliases b/tests/integration/targets/template/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/template/aliases +++ b/tests/integration/targets/template/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/traffic_type/aliases b/tests/integration/targets/traffic_type/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/traffic_type/aliases +++ b/tests/integration/targets/traffic_type/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/user/aliases b/tests/integration/targets/user/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/user/aliases +++ b/tests/integration/targets/user/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/vlan_ip_range/aliases b/tests/integration/targets/vlan_ip_range/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/vlan_ip_range/aliases +++ b/tests/integration/targets/vlan_ip_range/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/volume/aliases b/tests/integration/targets/volume/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/volume/aliases +++ b/tests/integration/targets/volume/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/volume_snapshot_policy/aliases b/tests/integration/targets/volume_snapshot_policy/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/volume_snapshot_policy/aliases +++ b/tests/integration/targets/volume_snapshot_policy/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/vpc/aliases b/tests/integration/targets/vpc/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/vpc/aliases +++ b/tests/integration/targets/vpc/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/vpc_offering/aliases b/tests/integration/targets/vpc_offering/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/vpc_offering/aliases +++ b/tests/integration/targets/vpc_offering/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/vpn_connection/aliases b/tests/integration/targets/vpn_connection/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/vpn_connection/aliases +++ b/tests/integration/targets/vpn_connection/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/vpn_customer_gateway/aliases b/tests/integration/targets/vpn_customer_gateway/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/vpn_customer_gateway/aliases +++ b/tests/integration/targets/vpn_customer_gateway/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/vpn_gateway/aliases b/tests/integration/targets/vpn_gateway/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/vpn_gateway/aliases +++ b/tests/integration/targets/vpn_gateway/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/zone/aliases b/tests/integration/targets/zone/aliases index 1d747ed2..da795605 100644 --- a/tests/integration/targets/zone/aliases +++ b/tests/integration/targets/zone/aliases @@ -1,3 +1,2 @@ cloud/cs cs/group2 -cs/group3 diff --git a/tests/integration/targets/zone_info/aliases b/tests/integration/targets/zone_info/aliases index 1f3b5b83..9716fea5 100644 --- a/tests/integration/targets/zone_info/aliases +++ b/tests/integration/targets/zone_info/aliases @@ -1,4 +1,3 @@ cloud/cs cs/group2 -cs/group3 cs/smoketest