Merge pull request #19619 from cevich/remove_ec2_experimental
Cirrus: Remove EC2 experimental flag
This commit is contained in:
		
						commit
						3e8f19be9d
					
				| 
						 | 
					@ -187,9 +187,6 @@ build_aarch64_task:
 | 
				
			||||||
    # Multiarch doesn't depend on buildability in this automation context
 | 
					    # Multiarch doesn't depend on buildability in this automation context
 | 
				
			||||||
    # Docs: ./contrib/cirrus/CIModes.md
 | 
					    # Docs: ./contrib/cirrus/CIModes.md
 | 
				
			||||||
    only_if: "$CIRRUS_CRON != 'multiarch'"
 | 
					    only_if: "$CIRRUS_CRON != 'multiarch'"
 | 
				
			||||||
    # Enable labeling of EC2 VMs with cirrus task ID. TODO: This can be
 | 
					 | 
				
			||||||
    # removed when the feature goes mainstream.
 | 
					 | 
				
			||||||
    experimental: true
 | 
					 | 
				
			||||||
    ec2_instance: &standard_build_ec2_aarch64
 | 
					    ec2_instance: &standard_build_ec2_aarch64
 | 
				
			||||||
        image: ${VM_IMAGE_NAME}
 | 
					        image: ${VM_IMAGE_NAME}
 | 
				
			||||||
        type: ${EC2_INST_TYPE}
 | 
					        type: ${EC2_INST_TYPE}
 | 
				
			||||||
| 
						 | 
					@ -275,7 +272,6 @@ validate_aarch64_task:
 | 
				
			||||||
    only_if: *is_pr
 | 
					    only_if: *is_pr
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
        - build_aarch64
 | 
					        - build_aarch64
 | 
				
			||||||
    experimental: true  # Enable labeling of EC2 VMs with cirrus task ID
 | 
					 | 
				
			||||||
    ec2_instance: *standard_build_ec2_aarch64
 | 
					    ec2_instance: *standard_build_ec2_aarch64
 | 
				
			||||||
    env:
 | 
					    env:
 | 
				
			||||||
        <<: *stdenvars_aarch64
 | 
					        <<: *stdenvars_aarch64
 | 
				
			||||||
| 
						 | 
					@ -599,7 +595,6 @@ windows_smoke_test_task:
 | 
				
			||||||
        $CIRRUS_BASE_BRANCH !=~ 'v[0-9\.]+-rhel'
 | 
					        $CIRRUS_BASE_BRANCH !=~ 'v[0-9\.]+-rhel'
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
      - alt_build
 | 
					      - alt_build
 | 
				
			||||||
    experimental: true  # Enable labeling of EC2 VMs with cirrus task ID
 | 
					 | 
				
			||||||
    ec2_instance:
 | 
					    ec2_instance:
 | 
				
			||||||
        image: "${WINDOWS_AMI}"
 | 
					        image: "${WINDOWS_AMI}"
 | 
				
			||||||
        type: m5zn.metal
 | 
					        type: m5zn.metal
 | 
				
			||||||
| 
						 | 
					@ -720,7 +715,6 @@ podman_machine_task:
 | 
				
			||||||
        - remote_integration_test
 | 
					        - remote_integration_test
 | 
				
			||||||
        - container_integration_test
 | 
					        - container_integration_test
 | 
				
			||||||
        - rootless_integration_test
 | 
					        - rootless_integration_test
 | 
				
			||||||
    experimental: true  # Enable labeling of EC2 VMs with cirrus task ID
 | 
					 | 
				
			||||||
    ec2_instance:
 | 
					    ec2_instance:
 | 
				
			||||||
        image: "${VM_IMAGE_NAME}"
 | 
					        image: "${VM_IMAGE_NAME}"
 | 
				
			||||||
        type: "${EC2_INST_TYPE}"
 | 
					        type: "${EC2_INST_TYPE}"
 | 
				
			||||||
| 
						 | 
					@ -749,7 +743,6 @@ podman_machine_aarch64_task:
 | 
				
			||||||
        - remote_integration_test
 | 
					        - remote_integration_test
 | 
				
			||||||
        - container_integration_test
 | 
					        - container_integration_test
 | 
				
			||||||
        - rootless_integration_test
 | 
					        - rootless_integration_test
 | 
				
			||||||
    experimental: true  # Enable labeling of EC2 VMs with cirrus task ID
 | 
					 | 
				
			||||||
    ec2_instance:
 | 
					    ec2_instance:
 | 
				
			||||||
        <<: *standard_build_ec2_aarch64
 | 
					        <<: *standard_build_ec2_aarch64
 | 
				
			||||||
    env:
 | 
					    env:
 | 
				
			||||||
| 
						 | 
					@ -793,7 +786,6 @@ local_system_test_aarch64_task: &local_system_test_task_aarch64
 | 
				
			||||||
    depends_on:
 | 
					    depends_on:
 | 
				
			||||||
        - build_aarch64
 | 
					        - build_aarch64
 | 
				
			||||||
        - unit_test
 | 
					        - unit_test
 | 
				
			||||||
    experimental: true  # Enable labeling of EC2 VMs with cirrus task ID
 | 
					 | 
				
			||||||
    ec2_instance: *standard_build_ec2_aarch64
 | 
					    ec2_instance: *standard_build_ec2_aarch64
 | 
				
			||||||
    env:
 | 
					    env:
 | 
				
			||||||
        <<: *stdenvars_aarch64
 | 
					        <<: *stdenvars_aarch64
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue