Disable S3 and encryption on u18 integration tests for mock/all/1.
This test is commonly used for sanity checking but the combination of S3 and encryption makes it hard to use and encourages temporary changes to make it usable.
Acknowledge this and disable S3 and encryption for this test and move them to mock/all/2.
@@ -68,8 +68,8 @@ sub run
{vm => VM2, remote => true, s3 => true, encrypt => false, delta => false},
{vm => VM3, remote => false, s3 => false, encrypt => false, delta => true},
{vm => VM3, remote => true, s3 => true, encrypt => true, delta => false},
- {vm => VM4, remote => false, s3 => true, encrypt => true, delta => false},
- {vm => VM4, remote => true, s3 => false, encrypt => false, delta => true},
+ {vm => VM4, remote => false, s3 => false, encrypt => false, delta => false},
+ {vm => VM4, remote => true, s3 => true, encrypt => true, delta => true},
)
{
# Only run tests for this vm
