diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml b/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml index cac5a3be9f75..b4f20a27cd7e 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client-samples.yml @@ -35,10 +35,12 @@ stages: pool.name: azsdk-pool-mms-ubuntu-2004-general image.name: MMSUbuntu20.04 go.version: '1.22.0' + GOEXPERIMENT: nocoverageredesign Windows_Go122: pool.name: azsdk-pool-mms-win-2022-general image.name: MMS2022 go.version: '1.22.0' + GOEXPERIMENT: nocoverageredesign pool: name: $(pool.name) vmImage: $(image.name) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 1edb9e9a5d02..a8e68fe78597 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -110,10 +110,12 @@ stages: pool.name: azsdk-pool-mms-ubuntu-2004-general image.name: MMSUbuntu20.04 go.version: '1.22.0' + GOEXPERIMENT: nocoverageredesign Windows_Go122: pool.name: azsdk-pool-mms-win-2022-general image.name: MMS2022 go.version: '1.22.0' + GOEXPERIMENT: nocoverageredesign generate.bom: true pool: name: $(pool.name) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-eng-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-eng-client.yml index f4861dd779e2..15d891609ae2 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-eng-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-eng-client.yml @@ -50,10 +50,12 @@ stages: pool.name: azsdk-pool-mms-ubuntu-2004-general image.name: MMSUbuntu20.04 go.version: '1.22.0' + GOEXPERIMENT: nocoverageredesign Windows_Go122: pool.name: azsdk-pool-mms-win-2022-general image.name: MMS2022 go.version: '1.22.0' + GOEXPERIMENT: nocoverageredesign generate.bom: true pool: name: $(pool.name) diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index e4a6c4619f5a..1b4667651382 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -12,8 +12,25 @@ }, "GoVersion": [ "1.18.10", - "1.21.7", - "1.22.0" + "1.21.7" ] - } + }, + "include": [ + { + "Agent": { + "ubuntu-20.04": { + "OSVmImage": "MMSUbuntu20.04", + "Pool": "azsdk-pool-mms-ubuntu-2004-general" + }, + "windows-2022": { + "OSVmImage": "MMS2022", + "Pool": "azsdk-pool-mms-win-2022-general" + } + }, + "GoVersion": [ + "1.22.0" + ], + "GOEXPERIMENT": "nocoverageredesign" + } + ] } diff --git a/sdk/internal/telemetry/telemetry_test.go b/sdk/internal/telemetry/telemetry_test.go index 9b86e8c64407..3cd5b35e704a 100644 --- a/sdk/internal/telemetry/telemetry_test.go +++ b/sdk/internal/telemetry/telemetry_test.go @@ -16,13 +16,16 @@ func TestFormat(t *testing.T) { // * azsdk-go-azservicebus/v1.0.0 (go1.19.3; linux) // * azsdk-go-azservicebus/v1.0.0 (go1.19; Windows_NT) // * azsdk-go-azservicebus/v1.0.0 (go1.21rc3; linux) + // * azsdk-go-azservicebus/v1.0.0 (go1.22.0 X:nocoverageredesign; linux) // // The OS varies based on the actual platform but it's a small set. re := `^azsdk-go-azservicebus/v1.0.0` + ` ` + `\(` + - `go\d+\.\d+(|\.\d+|rc\d+); (Windows_NT|linux|freebsd)` + + `go\d+\.\d+(?:|\.\d+|rc\d+)(?:\s[a-zA-Z0-9|:]+)?; (?:Windows_NT|linux|freebsd)` + `\)$` require.Regexp(t, re, userAgent) + require.Regexp(t, re, "azsdk-go-azservicebus/v1.0.0 (go1.21rc3; linux)") + require.Regexp(t, re, "azsdk-go-azservicebus/v1.0.0 (go1.22.0 X:nocoverageredesign; linux)") }