Add shippable matrix jobs for 2.9, 2.10 (#114)

* Add shippable matrix jobs for 2.9, 2.10

Run all supported Ansible revisions in test matrix

* Use branch names instead

shippable.yml

@@ -8,26 +8,53 @@ matrix:
   exclude:
     - env: T=none
   include:
-    - env: T=sanity/1
+    - env: T=sanity/1 A_REV=devel
+    - env: T=sanity/1 A_REV=stable-2.9
+    - env: T=sanity/1 A_REV=stable-2.10
 
-    - env: T=units/2.7/1
-    - env: T=units/3.6/1
-    - env: T=units/3.7/1
-    - env: T=units/3.8/1
+    - env: T=units/2.7/1 A_REV=devel
+    - env: T=units/3.6/1 A_REV=devel
+    - env: T=units/3.7/1 A_REV=devel
+    - env: T=units/3.8/1 A_REV=devel
 #   Until boto/botocore#2002 is fixed
-#    - env: T=units/3.9/1
-
-    - env: T=aws/2.7/1
-    - env: T=aws/3.7/1
+#    - env: T=units/3.9/1 A_REV=devel
+    - env: T=units/2.7/1 A_REV=stable-2.9
+    - env: T=units/3.6/1 A_REV=stable-2.9
+    - env: T=units/3.7/1 A_REV=stable-2.9
+    - env: T=units/3.8/1 A_REV=stable-2.9
+    - env: T=units/2.7/1 A_REV=stable-2.10
+    - env: T=units/3.6/1 A_REV=stable-2.10
+    - env: T=units/3.7/1 A_REV=stable-2.10
+    - env: T=units/3.8/1 A_REV=stable-2.10
+#   Until boto/botocore#2002 is fixed
+#    - env: T=units/3.9/1 A_REV=stable-2.10
+    - env: T=aws/2.7/1 A_REV=devel
+    - env: T=aws/3.7/1 A_REV=devel
+    - env: T=aws/2.7/1 A_REV=stable-2.9
+    - env: T=aws/3.7/1 A_REV=stable-2.9
+    - env: T=aws/2.7/1 A_REV=stable-2.10
+    - env: T=aws/3.7/1 A_REV=stable-2.10
 
-    - env: T=aws/2.7/2
-    - env: T=aws/3.7/2
+    - env: T=aws/2.7/2 A_REV=devel
+    - env: T=aws/3.7/2 A_REV=devel
+    - env: T=aws/2.7/2 A_REV=stable-2.9
+    - env: T=aws/3.7/2 A_REV=stable-2.9
+    - env: T=aws/2.7/2 A_REV=stable-2.10
+    - env: T=aws/3.7/2 A_REV=stable-2.10
 
-    - env: T=aws/2.7/3
-    - env: T=aws/3.7/3
+    - env: T=aws/2.7/3 A_REV=devel
+    - env: T=aws/3.7/3 A_REV=devel
+    - env: T=aws/2.7/3 A_REV=stable-2.9
+    - env: T=aws/3.7/3 A_REV=stable-2.9
+    - env: T=aws/2.7/3 A_REV=stable-2.10
+    - env: T=aws/3.7/3 A_REV=stable-2.10
 
-    - env: T=aws/2.7/4
-    - env: T=aws/3.7/4
+    - env: T=aws/2.7/4 A_REV=devel
+    - env: T=aws/3.7/4 A_REV=devel
+    - env: T=aws/2.7/4 A_REV=stable-2.9
+    - env: T=aws/3.7/4 A_REV=stable-2.9
+    - env: T=aws/2.7/4 A_REV=stable-2.10
+    - env: T=aws/3.7/4 A_REV=stable-2.10
 branches:
   except:
     - "*-patch-*"

tests/sanity/ignore-2.9.txt

@@ -150,51 +150,46 @@ tests/unit/modules/utils.py future-import-boilerplate
 tests/unit/modules/utils.py metaclass-boilerplate
 tests/utils/shippable/check_matrix.py replace-urlopen
 tests/utils/shippable/timing.py shebang
-plugins/modules/aws_acm_info.py ansible-deprecated-no-version
-plugins/modules/aws_kms_info.py ansible-deprecated-no-version
-plugins/modules/aws_kms.py ansible-deprecated-no-version
-plugins/modules/aws_region_info.py ansible-deprecated-no-version
-plugins/modules/aws_s3_bucket_info.py ansible-deprecated-no-version
-plugins/modules/aws_sgw_info.py ansible-deprecated-no-version
-plugins/modules/aws_waf_info.py ansible-deprecated-no-version
-plugins/modules/cloudfront_info.py ansible-deprecated-no-version
-plugins/modules/cloudwatchlogs_log_group_info.py ansible-deprecated-no-version
-plugins/modules/ec2_ami_copy.py ansible-deprecated-no-version
-plugins/modules/ec2_asg_info.py ansible-deprecated-no-version
-plugins/modules/ec2_customer_gateway_info.py ansible-deprecated-no-version
-plugins/modules/ec2_eip_info.py ansible-deprecated-no-version
-plugins/modules/ec2_elb_info.py ansible-deprecated-no-version
-plugins/modules/ec2_instance_info.py ansible-deprecated-no-version
-plugins/modules/ec2_lc_info.py ansible-deprecated-no-version
-plugins/modules/ec2_metric_alarm.py ansible-deprecated-no-version
-plugins/modules/ec2_placement_group_info.py ansible-deprecated-no-version
-plugins/modules/ec2_vpc_endpoint_info.py ansible-deprecated-no-version
-plugins/modules/ec2_vpc_igw_info.py ansible-deprecated-no-version
-plugins/modules/ec2_vpc_nacl_info.py ansible-deprecated-no-version
-plugins/modules/ec2_vpc_nat_gateway_info.py ansible-deprecated-no-version
-plugins/modules/ec2_vpc_peering_info.py ansible-deprecated-no-version
-plugins/modules/ec2_vpc_route_table_info.py ansible-deprecated-no-version
-plugins/modules/ec2_vpc_vgw_info.py ansible-deprecated-no-version
-plugins/modules/ec2_vpc_vpn_info.py ansible-deprecated-no-version
-plugins/modules/ecs_ecr.py ansible-deprecated-no-version
-plugins/modules/ecs_service_info.py ansible-deprecated-no-version
-plugins/modules/ecs_taskdefinition_info.py ansible-deprecated-no-version
-plugins/modules/efs_info.py ansible-deprecated-no-version
-plugins/modules/elasticache_info.py ansible-deprecated-no-version
-plugins/modules/elb_application_lb_info.py ansible-deprecated-no-version
-plugins/modules/elb_classic_lb_info.py ansible-deprecated-no-version
-plugins/modules/elb_network_lb.py ansible-deprecated-no-version
-plugins/modules/elb_target_group_info.py ansible-deprecated-no-version
-plugins/modules/elb_target_info.py ansible-deprecated-no-version
-plugins/modules/iam_mfa_device_info.py ansible-deprecated-no-version
-plugins/modules/iam_policy.py ansible-deprecated-no-version
-plugins/modules/iam_role_info.py ansible-deprecated-no-version
-plugins/modules/iam_role.py ansible-deprecated-no-version
-plugins/modules/iam_server_certificate_info.py ansible-deprecated-no-version
-plugins/modules/lambda_facts.py ansible-deprecated-no-version
-plugins/modules/rds_instance_info.py ansible-deprecated-no-version
-plugins/modules/rds.py ansible-deprecated-no-version
-plugins/modules/rds_snapshot_info.py ansible-deprecated-no-version
-plugins/modules/redshift_info.py ansible-deprecated-no-version
-plugins/modules/route53_info.py ansible-deprecated-no-version
-
+plugins/modules/aws_acm_info.py pylint:ansible-deprecated-no-version
+plugins/modules/aws_kms_info.py pylint:ansible-deprecated-no-version
+plugins/modules/aws_kms.py pylint:ansible-deprecated-no-version
+plugins/modules/aws_region_info.py pylint:ansible-deprecated-no-version
+plugins/modules/aws_s3_bucket_info.py pylint:ansible-deprecated-no-version
+plugins/modules/aws_sgw_info.py pylint:ansible-deprecated-no-version
+plugins/modules/aws_waf_info.py pylint:ansible-deprecated-no-version
+plugins/modules/cloudfront_info.py pylint:ansible-deprecated-no-version
+plugins/modules/cloudwatchlogs_log_group_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_asg_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_customer_gateway_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_eip_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_elb_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_instance_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_lc_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_metric_alarm.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_placement_group_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_vpc_endpoint_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_vpc_igw_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_vpc_nacl_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_vpc_nat_gateway_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_vpc_peering_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_vpc_route_table_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_vpc_vgw_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ec2_vpc_vpn_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ecs_service_info.py pylint:ansible-deprecated-no-version
+plugins/modules/ecs_taskdefinition_info.py pylint:ansible-deprecated-no-version
+plugins/modules/efs_info.py pylint:ansible-deprecated-no-version
+plugins/modules/elasticache_info.py pylint:ansible-deprecated-no-version
+plugins/modules/elb_application_lb_info.py pylint:ansible-deprecated-no-version
+plugins/modules/elb_classic_lb_info.py pylint:ansible-deprecated-no-version
+plugins/modules/elb_network_lb.py pylint:ansible-deprecated-no-version
+plugins/modules/elb_target_group_info.py pylint:ansible-deprecated-no-version
+plugins/modules/elb_target_info.py pylint:ansible-deprecated-no-version
+plugins/modules/iam_mfa_device_info.py pylint:ansible-deprecated-no-version
+plugins/modules/iam_policy.py pylint:ansible-deprecated-no-version
+plugins/modules/iam_role_info.py pylint:ansible-deprecated-no-version
+plugins/modules/iam_role.py pylint:ansible-deprecated-no-version
+plugins/modules/iam_server_certificate_info.py pylint:ansible-deprecated-no-version
+plugins/modules/rds_instance_info.py pylint:ansible-deprecated-no-version
+plugins/modules/rds_snapshot_info.py pylint:ansible-deprecated-no-version
+plugins/modules/redshift_info.py pylint:ansible-deprecated-no-version
+plugins/modules/route53_info.py pylint:ansible-deprecated-no-version

tests/utils/shippable/shippable.sh

@@ -75,11 +75,7 @@ set -ux
 
 pip install setuptools==44.1.0
 
-if [ -n "${ANSIBLE_BASE_REV:-}" ]; then
-    pip install "ansible~=${ANSIBLE_BASE_REV}"
-else
-    pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
-fi
+pip install https://github.com/ansible/ansible/archive/"${A_REV:-devel}".tar.gz --disable-pip-version-check
 
 #ansible-galaxy collection install community.general
 mkdir -p "${HOME}/.ansible/collections/ansible_collections/community"
@@ -120,7 +116,7 @@ function cleanup
             cp -a tests/output/reports/coverage=*.xml "$SHIPPABLE_RESULT_DIR/codecoverage/"
 
             # analyze and capture code coverage aggregated by integration test target if not on 2.9, defaults to devel if unset
-            if [ -n "${ANSIBLE_BASE_REV:-}" ] || [ "${ANSIBLE_BASE_REV:-}" != "2.9" ]; then
+            if [ -z "${A_REV:-}" ] || [ "${A_REV:-}" != "stable-2.9" ]; then
                 ansible-test coverage analyze targets generate -v "$SHIPPABLE_RESULT_DIR/testresults/coverage-analyze-targets.json"
             fi