From 236db93dd3941465eac54e1d89daca3cbf5eb51d Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 29 Oct 2020 16:45:32 -0700 Subject: [PATCH 1/4] Shorten test name that is too long for Windows git --- .../templates/jobs/archetype-sdk-client.yml | 5 ++- out.txt | 0 ...VirtualMachineScaleSetOperationsTests.java | 36 ++++++++++--------- ...erentPoolOfZoneResilientLoadBalancer.json} | 0 4 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 out.txt rename sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/{VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json => VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVMScaleSetsWithDifferentPoolOfZoneResilientLoadBalancer.json} (100%) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 6b27ca53c68c..9c74832ddeb6 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -170,6 +170,10 @@ jobs: Directory: sdk/${{ parameters.ServiceDirectory }} CheckLinkGuidance: $true + - template: /eng/common/pipelines/templates/steps/verify-path-length.yml + parameters: + SourceDirectory: $(Build.SourcesDirectory) + - ${{if ne(parameters.SDKType, 'data')}}: - ${{ each artifact in parameters.Artifacts }}: - template: /eng/common/pipelines/templates/steps/verify-changelog.yml @@ -351,4 +355,3 @@ jobs: inputs: mergeTestResults: true testRunTitle: $(RunTitle) - \ No newline at end of file diff --git a/out.txt b/out.txt new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java index 18736030e9b3..953b5a501321 100644 --- a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java +++ b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/java/com/azure/resourcemanager/compute/VirtualMachineScaleSetOperationsTests.java @@ -10,7 +10,11 @@ import com.azure.core.http.HttpResponse; import com.azure.core.http.netty.NettyAsyncHttpClientBuilder; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.management.Region; import com.azure.core.management.SubResource; +import com.azure.core.management.profile.AzureProfile; +import com.azure.resourcemanager.authorization.models.BuiltInRole; +import com.azure.resourcemanager.authorization.models.RoleAssignment; import com.azure.resourcemanager.compute.models.KnownLinuxVirtualMachineImage; import com.azure.resourcemanager.compute.models.OperatingSystemTypes; import com.azure.resourcemanager.compute.models.PowerState; @@ -28,8 +32,6 @@ import com.azure.resourcemanager.compute.models.VirtualMachineScaleSetSkuTypes; import com.azure.resourcemanager.compute.models.VirtualMachineScaleSetVM; import com.azure.resourcemanager.compute.models.VirtualMachineScaleSetVMs; -import com.azure.resourcemanager.authorization.models.BuiltInRole; -import com.azure.resourcemanager.authorization.models.RoleAssignment; import com.azure.resourcemanager.keyvault.models.Secret; import com.azure.resourcemanager.keyvault.models.Vault; import com.azure.resourcemanager.network.models.ApplicationSecurityGroup; @@ -44,14 +46,20 @@ import com.azure.resourcemanager.network.models.SecurityRuleProtocol; import com.azure.resourcemanager.network.models.VirtualMachineScaleSetNetworkInterface; import com.azure.resourcemanager.network.models.VirtualMachineScaleSetNicIpConfiguration; +import com.azure.resourcemanager.resources.fluentcore.arm.AvailabilityZoneId; import com.azure.resourcemanager.resources.fluentcore.utils.ResourceManagerUtils; import com.azure.resourcemanager.resources.models.ResourceGroup; -import com.azure.resourcemanager.test.utils.TestUtilities; -import com.azure.resourcemanager.resources.fluentcore.arm.AvailabilityZoneId; -import com.azure.core.management.Region; -import com.azure.core.management.profile.AzureProfile; import com.azure.resourcemanager.storage.models.StorageAccount; import com.azure.resourcemanager.storage.models.StorageAccountKey; +import com.azure.resourcemanager.test.utils.TestUtilities; +import com.azure.storage.blob.BlobContainerClient; +import com.azure.storage.blob.BlobServiceClient; +import com.azure.storage.blob.BlobServiceClientBuilder; +import com.azure.storage.blob.specialized.BlockBlobClient; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.BufferedInputStream; import java.io.File; @@ -62,15 +70,6 @@ import java.util.List; import java.util.Map; -import com.azure.storage.blob.BlobContainerClient; -import com.azure.storage.blob.BlobServiceClient; -import com.azure.storage.blob.BlobServiceClientBuilder; -import com.azure.storage.blob.specialized.BlockBlobClient; -import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; - public class VirtualMachineScaleSetOperationsTests extends ComputeManagementTest { private String rgName = ""; private final Region region = Region.US_WEST; @@ -724,9 +723,14 @@ public void canCreateVirtualMachineScaleSet() throws Exception { Assertions.assertTrue(nicCount > 0); } + /* + * Previously name + * canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer + * but this was too long for some OSes and would cause git checkout to fail. + */ @Test public void - canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer() + canCreateTwoRegionalVMScaleSetsWithDifferentPoolOfZoneResilientLoadBalancer() throws Exception { // Zone resilient resource -> resources deployed in all zones by the service and it will be served by all AZs // all the time. diff --git a/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json b/sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVMScaleSetsWithDifferentPoolOfZoneResilientLoadBalancer.json similarity index 100% rename from sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVirtualMachineScaleSetsAndAssociateEachWithDifferentBackendPoolOfZoneResilientLoadBalancer.json rename to sdk/resourcemanager/azure-resourcemanager-compute/src/test/resources/session-records/VirtualMachineScaleSetOperationsTests.canCreateTwoRegionalVMScaleSetsWithDifferentPoolOfZoneResilientLoadBalancer.json From 9993fa872af7d2291f534a9ce0d995af59a7252f Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 29 Oct 2020 17:19:37 -0700 Subject: [PATCH 2/4] Disable long path validation and reverted OS image changes --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 7 ++++--- .../templates/stages/archetype-java-release-pom-only.yml | 4 ++-- eng/pipelines/templates/stages/archetype-java-release.yml | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 9c74832ddeb6..493e007aef16 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -170,9 +170,10 @@ jobs: Directory: sdk/${{ parameters.ServiceDirectory }} CheckLinkGuidance: $true - - template: /eng/common/pipelines/templates/steps/verify-path-length.yml - parameters: - SourceDirectory: $(Build.SourcesDirectory) + # Disabled for now until long term decision can be made for violating files. + #- template: /eng/common/pipelines/templates/steps/verify-path-length.yml + # parameters: + # SourceDirectory: $(Build.SourcesDirectory) - ${{if ne(parameters.SDKType, 'data')}}: - ${{ each artifact in parameters.Artifacts }}: diff --git a/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml b/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml index 730920e682b1..f048862cf43d 100644 --- a/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml +++ b/eng/pipelines/templates/stages/archetype-java-release-pom-only.yml @@ -60,7 +60,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 strategy: runOnce: deploy: @@ -81,7 +81,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 strategy: runOnce: deploy: diff --git a/eng/pipelines/templates/stages/archetype-java-release.yml b/eng/pipelines/templates/stages/archetype-java-release.yml index f4ae987c344b..7b9048ce1096 100644 --- a/eng/pipelines/templates/stages/archetype-java-release.yml +++ b/eng/pipelines/templates/stages/archetype-java-release.yml @@ -101,7 +101,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 strategy: runOnce: deploy: @@ -122,7 +122,7 @@ stages: variables: - template: ../variables/globals.yml pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 strategy: runOnce: deploy: @@ -163,7 +163,7 @@ stages: CIConfigs: "{'targets':[{'path_to_config':'package.json','mode':'Preview','monikerid':'1'},{'path_to_config':'package.json','mode':'Latest','monikerid':'0'}]}" skipComponentGovernanceDetection: true pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 strategy: runOnce: deploy: @@ -268,7 +268,7 @@ stages: value: https://pkgs.dev.azure.com/azure-sdk/internal/_packaging/azure-sdk-for-java-pr/maven/v1 pool: - vmImage: windows-2019 + vmImage: vs2017-win2016 steps: - checkout: self path: azure-sdk-for-java From 6f575adf28b473715bdb1d686b248adf578c2af6 Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 29 Oct 2020 17:30:28 -0700 Subject: [PATCH 3/4] Reenable length check with different base path length --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 493e007aef16..ef89732b40cd 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -170,10 +170,11 @@ jobs: Directory: sdk/${{ parameters.ServiceDirectory }} CheckLinkGuidance: $true - # Disabled for now until long term decision can be made for violating files. - #- template: /eng/common/pipelines/templates/steps/verify-path-length.yml - # parameters: - # SourceDirectory: $(Build.SourcesDirectory) + # Use BasePathLength of 38 instead of the default 49 as some GA'd files fail when the number is higher. + - template: /eng/common/pipelines/templates/steps/verify-path-length.yml + parameters: + SourceDirectory: $(Build.SourcesDirectory) + BasePathLength: 38 - ${{if ne(parameters.SDKType, 'data')}}: - ${{ each artifact in parameters.Artifacts }}: From 6ab1dd747a30791189c95f0c4726048d68223be0 Mon Sep 17 00:00:00 2001 From: alzimmermsft <48699787+alzimmermsft@users.noreply.github.com> Date: Thu, 29 Oct 2020 17:33:48 -0700 Subject: [PATCH 4/4] Remove accidentally added file --- out.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 out.txt diff --git a/out.txt b/out.txt deleted file mode 100644 index e69de29bb2d1..000000000000