rm group3

resmo · resmo · commit db4abc39da87 · 2024-11-30T11:42:23.000+01:00
diff --git a/.github/workflows/integration-changed.yml b/.github/workflows/integration-changed.yml
diff --git 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
@@ -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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group1
-cs/group3
diff --git 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
@@ -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
@@ -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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group1
-cs/group3
diff --git 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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group1
-cs/group3
diff --git 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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group1
-cs/group3
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group1
-cs/group3i
diff --git 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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group1
-cs/group3
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group1
-cs/group3
diff --git 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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group2
-cs/group3
diff --git 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
@@ -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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group2
-cs/group3
diff --git 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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group2
-cs/group3
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group2
-cs/group3
diff --git 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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group2
-cs/group3
diff --git 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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group2
-cs/group3
diff --git 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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group2
-cs/group3
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,2 @@
 cloud/cs
 cs/group2
-cs/group3
diff --git 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
@@ -1,4 +1,3 @@
 cloud/cs
 cs/group2
-cs/group3
 cs/smoketest

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`cloud/cs`
`2`	`2`	`cs/group1`
`3`		`-cs/group3`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`cloud/cs`
`2`	`2`	`cs/group2`
`3`		`-cs/group3`