Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AKS Fleet 2023 08 15 preview #25756

Merged
merged 8 commits into from
Sep 26, 2023
Merged

AKS Fleet 2023 08 15 preview #25756

merged 8 commits into from
Sep 26, 2023

Conversation

zman-ms
Copy link
Contributor

@zman-ms zman-ms commented Sep 12, 2023

ARM (Control Plane) API Specification Update Pull Request

PR review workflow diagram

Please understand this diagram before proceeding. It explains how to get your PR approved & merged.

diagram

[1] ARM review queue (for merge queues, see [4])
The PRs are processed by time opened, ascending. Your PR may show up on 2nd or later page.
If you addressed Step 1 from the diagram and your PR is not showing up in the queue, ensure the label ARMChangesRequested
is removed from your PR. This should cause the label WaitForARMFeedback to be added.
[2] https://aka.ms/azsdk/support/specreview-channel
[3] List of SDK breaking changes approvers in pinned Teams announcement
[4] public repo merge queue, private repo merge queue (for ARM review queue, [1])

If you need further help with anything, see Getting help section below.

Purpose of this PR

What's the purpose of this PR? Check all that apply. This is mandatory!

  • New API version. (Such PR should have been generated with OpenAPI Hub, per this wiki doc.)
  • Update existing version for a new feature. (This is applicable only when you are revising a private preview API version.)
  • Update existing version to fix swagger quality issues in S360.
  • Other, please clarify:
    • edit this with your clarification

Due diligence checklist

To merge this PR, you must go through the following checklist and confirm you understood
and followed the instructions by checking all the boxes:

Breaking changes review (Step 1)

  • If the automation determines you have breaking changes, i.e. Step 1 from the diagram applies to you,
    you must follow the breaking changes process.
    IMPORTANT This applies even if:
    • The tool fails while it shouldn't, e.g. due to runtime exception, or incorrect detection of breaking changes.
    • You believe there is no need for you to request breaking change approval, for any reason.
      Such claims must be reviewed, and the process is the same.

ARM API changes review (Step 2)

  • If this PR is in purview of ARM review then automation will add the ARMReview label.
  • If you want to force ARM review, add the label yourself.
  • Proceed according to the diagram at the top of this comment.

Viewing API changes

For convenient view of the API changes made by this PR, refer to the URLs provided in the table
in the Generated ApiView comment added to this PR. You can use ApiView to show API versions diff.

Suppressing failures

If one or multiple validation error/warning suppression(s) is detected in your PR, please follow the
Swagger-Suppression-Process
to get approval.

Getting help

…preview/2023-06-15-preview to version 2023-08-15-preview
* Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-07-15-preview

* rebase

* Updates API version in new specs and examples

* new tsp files

* new tsp files

* readme files

* copy example files

* new example files

* fix example files

* compile

* compile to add new example files

* improve comments

* format tsp files

* re-compile

* improve comments

* visibility concistency
* add VMSize to hub profile
* add VMSize examples
* improve description
* format
@openapi-pipeline-app
Copy link

openapi-pipeline-app bot commented Sep 12, 2023

Next Steps to Merge

✔️ All automated merging requirements have been met! Refer to step 4 in the PR workflow diagram (even if your PR is for data plane, not ARM).

@openapi-pipeline-app
Copy link

openapi-pipeline-app bot commented Sep 12, 2023

Swagger Validation Report

️️✔️BreakingChange succeeded [Detail] [Expand]
There are no breaking changes.
compared swaggers (via Oad v0.10.4)] new version base version
fleets.json 2023-03-15-preview(f03349e) 2023-03-15-preview(main)
fleets.json 2023-06-15-preview(f03349e) 2023-06-15-preview(main)
️️✔️Breaking Change(Cross-Version) succeeded [Detail] [Expand]
There are no breaking changes.
compared swaggers (via Oad v0.10.4)] new version base version
fleets.json 2023-08-15-preview(f03349e) 2023-06-15-preview(main)
️️✔️CredScan succeeded [Detail] [Expand]
There is no credential detected.
️️✔️LintDiff succeeded [Detail] [Expand]
Validation passes for LintDiff.
compared tags (via openapi-validator v2.1.4) new version base version
package-2023-06-preview package-2023-06-preview(f03349e) package-2023-06-preview(main)
package-2023-03-preview package-2023-03-preview(f03349e) package-2023-03-preview(main)
package-2023-08-preview package-2023-08-preview(f03349e) default(main)
️️✔️Avocado succeeded [Detail] [Expand]
Validation passes for Avocado.
️️✔️SwaggerAPIView succeeded [Detail] [Expand]
️️✔️TypeSpecAPIView succeeded [Detail] [Expand]
️️✔️ModelValidation succeeded [Detail] [Expand]
Validation passes for ModelValidation.
️️✔️SemanticValidation succeeded [Detail] [Expand]
Validation passes for SemanticValidation.
️️✔️PoliCheck succeeded [Detail] [Expand]
Validation passed for PoliCheck.
️️✔️PrettierCheck succeeded [Detail] [Expand]
Validation passes for PrettierCheck.
️️✔️SpellCheck succeeded [Detail] [Expand]
Validation passes for SpellCheck.
️️✔️Lint(RPaaS) succeeded [Detail] [Expand]
Validation passes for Lint(RPaaS).
️️✔️PR Summary succeeded [Detail] [Expand]
Validation passes for Summary.
️️✔️Automated merging requirements met succeeded [Detail] [Expand]
Posted by Swagger Pipeline | How to fix these errors?

@openapi-workflow-bot
Copy link

Hi @zman-ms, this service has enabled Service API Toolset. All spec updates MUST be initiated from service ADO project repo, so that to guarantee it to be the source of truth., please review this pull request if it's intentional or reject it if it's not expected. Normally, all the specification or example changes should start with PR created in ADO.

  • You can refer to Service API Toolset Introduction for details.
  • Please contact service focal contacts or Service API Toolset Support Channel if need further help.
  • @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Sep 12, 2023

    Swagger Generation Artifacts

    ️🔄ApiDocPreview inProgress [Detail]
    ️️✔️SDK Breaking Change Tracking succeeded [Detail] [Expand]

    Breaking Changes Tracking




    ️⚠️ azure-sdk-for-python-track2 warning [Detail]
    • ⚠️Warning [Logs]Release - Generate from 3f4960b. SDK Automation 14.0.0
      command	sh scripts/automation_init.sh ../azure-sdk-for-python_tmp/initInput.json ../azure-sdk-for-python_tmp/initOutput.json
      cmderr	[automation_init.sh] WARNING: Skipping azure-nspkg as it is not installed.
      warn		specification/containerservice/Fleet.Management/tspconfig.yaml skipped due to azure-sdk-for-python-track2 not found in tspconfig.yaml
      command	sh scripts/automation_generate.sh ../azure-sdk-for-python_tmp/generateInput.json ../azure-sdk-for-python_tmp/generateOutput.json
      cmderr	[automation_generate.sh]
      cmderr	[automation_generate.sh] npm notice New major version of npm available! 9.6.7 -> 10.1.0
      cmderr	[automation_generate.sh] npm notice Changelog: <https://github.com/npm/cli/releases/tag/v10.1.0>
      cmderr	[automation_generate.sh] npm notice Run `npm install -g [email protected]` to update!
      cmderr	[automation_generate.sh] npm notice
    • ️✔️track2_azure-mgmt-containerservicefleet [View full logs]  [Release SDK Changes]
      info	[Changelog] ### Features Added
      info	[Changelog]
      info	[Changelog]   - Added operation group FleetUpdateStrategiesOperations
      info	[Changelog]   - Model AgentProfile has a new parameter vm_size
      info	[Changelog]   - Model FleetHubProfile has a new parameter portal_fqdn
      info	[Changelog]   - Model UpdateRun has a new parameter update_strategy_id
    ️⚠️ azure-sdk-for-java warning [Detail]
    ️️✔️ azure-sdk-for-go succeeded [Detail] [Expand]
    • ️✔️Succeeded [Logs]Release - Generate from 3f4960b. SDK Automation 14.0.0
      command	sh ./eng/scripts/automation_init.sh ../../../../../azure-sdk-for-go_tmp/initInput.json ../../../../../azure-sdk-for-go_tmp/initOutput.json
      warn		specification/containerservice/Fleet.Management/tspconfig.yaml skipped due to azure-sdk-for-go not found in tspconfig.yaml
      command	generator automation-v2 ../../../../../azure-sdk-for-go_tmp/generateInput.json ../../../../../azure-sdk-for-go_tmp/generateOutput.json
    • ️✔️sdk/resourcemanager/containerservicefleet/armcontainerservicefleet [View full logs]  [Release SDK Changes]
      info	[Changelog] ### Features Added
      info	[Changelog]
      info	[Changelog] - New enum type `FleetUpdateStrategyProvisioningState` with values `FleetUpdateStrategyProvisioningStateCanceled`, `FleetUpdateStrategyProvisioningStateFailed`, `FleetUpdateStrategyProvisioningStateSucceeded`
      info	[Changelog] - New function `*ClientFactory.NewFleetUpdateStrategiesClient() *FleetUpdateStrategiesClient`
      info	[Changelog] - New function `NewFleetUpdateStrategiesClient(string, azcore.TokenCredential, *arm.ClientOptions) (*FleetUpdateStrategiesClient, error)`
      info	[Changelog] - New function `*FleetUpdateStrategiesClient.BeginCreateOrUpdate(context.Context, string, string, string, FleetUpdateStrategy, *FleetUpdateStrategiesClientBeginCreateOrUpdateOptions) (*runtime.Poller[FleetUpdateStrategiesClientCreateOrUpdateResponse], error)`
      info	[Changelog] - New function `*FleetUpdateStrategiesClient.BeginDelete(context.Context, string, string, string, *FleetUpdateStrategiesClientBeginDeleteOptions) (*runtime.Poller[FleetUpdateStrategiesClientDeleteResponse], error)`
      info	[Changelog] - New function `*FleetUpdateStrategiesClient.Get(context.Context, string, string, string, *FleetUpdateStrategiesClientGetOptions) (FleetUpdateStrategiesClientGetResponse, error)`
      info	[Changelog] - New function `*FleetUpdateStrategiesClient.NewListByFleetPager(string, string, *FleetUpdateStrategiesClientListByFleetOptions) *runtime.Pager[FleetUpdateStrategiesClientListByFleetResponse]`
      info	[Changelog] - New struct `FleetUpdateStrategy`
      info	[Changelog] - New struct `FleetUpdateStrategyListResult`
      info	[Changelog] - New struct `FleetUpdateStrategyProperties`
      info	[Changelog] - New field `VMSize` in struct `AgentProfile`
      info	[Changelog] - New field `PortalFqdn` in struct `FleetHubProfile`
      info	[Changelog] - New field `UpdateStrategyID` in struct `UpdateRunProperties`
      info	[Changelog]
      info	[Changelog] Total 0 breaking change(s), 19 additive change(s).
    ️️✔️ azure-sdk-for-js succeeded [Detail] [Expand]
    • ️✔️Succeeded [Logs]Release - Generate from 3f4960b. SDK Automation 14.0.0
      command	sh .scripts/automation_init.sh ../azure-sdk-for-js_tmp/initInput.json ../azure-sdk-for-js_tmp/initOutput.json
      warn	File azure-sdk-for-js_tmp/initOutput.json not found to read
      command	sh .scripts/automation_generate.sh ../azure-sdk-for-js_tmp/generateInput.json ../azure-sdk-for-js_tmp/generateOutput.json
    • ️✔️@azure/arm-containerservicefleet [View full logs]  [Release SDK Changes]
      info	[Changelog] **Features**
      info	[Changelog]
      info	[Changelog]   - Added operation group FleetUpdateStrategies
      info	[Changelog]   - Added Interface FleetUpdateStrategiesCreateOrUpdateHeaders
      info	[Changelog]   - Added Interface FleetUpdateStrategiesCreateOrUpdateOptionalParams
      info	[Changelog]   - Added Interface FleetUpdateStrategiesDeleteHeaders
      info	[Changelog]   - Added Interface FleetUpdateStrategiesDeleteOptionalParams
      info	[Changelog]   - Added Interface FleetUpdateStrategiesGetOptionalParams
      info	[Changelog]   - Added Interface FleetUpdateStrategiesListByFleetNextOptionalParams
      info	[Changelog]   - Added Interface FleetUpdateStrategiesListByFleetOptionalParams
      info	[Changelog]   - Added Interface FleetUpdateStrategy
      info	[Changelog]   - Added Interface FleetUpdateStrategyListResult
      info	[Changelog]   - Added Type Alias FleetUpdateStrategiesCreateOrUpdateResponse
      info	[Changelog]   - Added Type Alias FleetUpdateStrategiesGetResponse
      info	[Changelog]   - Added Type Alias FleetUpdateStrategiesListByFleetNextResponse
      info	[Changelog]   - Added Type Alias FleetUpdateStrategiesListByFleetResponse
      info	[Changelog]   - Added Type Alias FleetUpdateStrategyProvisioningState
      info	[Changelog]   - Interface AgentProfile has a new optional parameter vmSize
      info	[Changelog]   - Interface FleetHubProfile has a new optional parameter portalFqdn
      info	[Changelog]   - Interface UpdateRun has a new optional parameter updateStrategyId
      info	[Changelog]   - Added Enum KnownFleetUpdateStrategyProvisioningState
    ️❌ azure-sdk-for-net-track2 failed [Detail]
    • Failed [Logs]Release - Generate from 3f4960b. SDK Automation 14.0.0
      command	pwsh ./eng/scripts/Automation-Sdk-Init.ps1 ../azure-sdk-for-net_tmp/initInput.json ../azure-sdk-for-net_tmp/initOutput.json
      warn		specification/containerservice/Fleet.Management/tspconfig.yaml skipped due to azure-sdk-for-net-track2 not found in tspconfig.yaml
      command	pwsh ./eng/scripts/Invoke-GenerateAndBuildV2.ps1 ../azure-sdk-for-net_tmp/generateInput.json ../azure-sdk-for-net_tmp/generateOutput.json
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[31;1mGeneratePackage: �[0m/mnt/vss/_work/1/s/azure-sdk-for-net/eng/scripts/automation/GenerateAndBuildLib.ps1:714
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1mLine |
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1m 714 | �[0m         �[36;1mGeneratePackage -projectFolder $projectFolder -sdkRootPath $s�[0m …
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1m     | �[31;1m         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[31;1m�[36;1m     | �[31;1mFailed to generate sdk. exit code: False
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[0m
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[31;1mGet-ChildItem: �[0m/mnt/vss/_work/1/s/azure-sdk-for-net/eng/scripts/automation/GenerateAndBuildLib.ps1:807
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1mLine |
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1m 807 | �[0m … rtifacts += �[36;1mGet-ChildItem $artifactsPath -Filter *.nupkg -exclude *.s�[0m …
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1m     | �[31;1m               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[31;1m�[36;1m     | �[31;1mCannot find path
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1m     | �[31;1m'/mnt/vss/_work/1/s/azure-sdk-for-net/artifacts/packages/Debug/' because
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1m     | �[31;1mit does not exist.
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[0m
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[31;1mGeneratePackage: �[0m/mnt/vss/_work/1/s/azure-sdk-for-net/eng/scripts/automation/GenerateAndBuildLib.ps1:714
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1mLine |
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1m 714 | �[0m         �[36;1mGeneratePackage -projectFolder $projectFolder -sdkRootPath $s�[0m …
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[36;1m     | �[31;1m         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[31;1m�[36;1m     | �[31;1mFailed to generate sdk artifact
      cmderr	[Invoke-GenerateAndBuildV2.ps1] �[0m
    • Azure.ResourceManager.ContainerService [View full logs]  [Release SDK Changes]
      info	[Changelog]
    ️⚠️ azure-resource-manager-schemas warning [Detail]
    • ⚠️Warning [Logs]Release - Generate from 3f4960b. Schema Automation 14.0.0
      command	.sdkauto/initScript.sh ../azure-resource-manager-schemas_tmp/initInput.json ../azure-resource-manager-schemas_tmp/initOutput.json
      cmderr	[initScript.sh] npm notice
      cmderr	[initScript.sh] npm notice New major version of npm available! 8.19.4 -> 10.1.0
      cmderr	[initScript.sh] npm notice Changelog: <https://github.com/npm/cli/releases/tag/v10.1.0>
      cmderr	[initScript.sh] npm notice Run `npm install -g [email protected]` to update!
      cmderr	[initScript.sh] npm notice
      warn	File azure-resource-manager-schemas_tmp/initOutput.json not found to read
      command	.sdkauto/generateScript.sh ../azure-resource-manager-schemas_tmp/generateInput.json ../azure-resource-manager-schemas_tmp/generateOutput.json
      warn	No file changes detected after generation
    • ️✔️containerservice [View full logs
    ️❌ azure-powershell failed [Detail]
    • Pipeline Framework Failed [Logs]Release - Generate from 3f4960b. SDK Automation 14.0.0
      command	sh ./tools/SwaggerCI/init.sh ../azure-powershell_tmp/initInput.json ../azure-powershell_tmp/initOutput.json
      warn		specification/containerservice/Fleet.Management/tspconfig.yaml skipped due to azure-powershell not found in tspconfig.yaml
      command	pwsh ./tools/SwaggerCI/psci.ps1 ../azure-powershell_tmp/generateInput.json ../azure-powershell_tmp/generateOutput.json
      SSL error: syscall failure: Broken pipe
      Error: SSL error: syscall failure: Broken pipe
    • ️✔️Az.containerservice.DefaultTag [View full logs
      error	Fatal error: SSL error: syscall failure: Broken pipe
      error	The following packages are still pending:
      error		Az.containerservice.DefaultTag
    Posted by Swagger Pipeline | How to fix these errors?

    @openapi-pipeline-app
    Copy link

    openapi-pipeline-app bot commented Sep 12, 2023

    Generated ApiView

    Language Package Name ApiView Link
    Go sdk/resourcemanager/containerservicefleet/armcontainerservicefleet https://apiview.dev/Assemblies/Review/fafce62acbed4c9faf1503822cc943e3
    JavaScript @azure/arm-containerservicefleet https://apiview.dev/Assemblies/Review/78c6ddca83204feeaf6334998d9b4c82
    Java azure-resourcemanager-containerservicefleet https://apiview.dev/Assemblies/Review/cb148a7533fc40cb84f01a1772ca0d32

    @openapi-workflow-bot openapi-workflow-bot bot added ShiftLeftViolation DoNotMerge <valid label in PR review process> use to hold merge after approval labels Sep 12, 2023
    @AzureRestAPISpecReview AzureRestAPISpecReview added ARMReview CI-MissingBaseCommit new-api-version ReadyForApiTest <valid label in PR review process>add this label when swagger and service APIs are ready for test resource-manager WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required labels Sep 12, 2023
    @openapi-workflow-bot
    Copy link

    Hi @zman-ms! For review efficiency consideration, when creating a new API version, it is required to place API specs of the base version in the first commit, and push new version updates into successive commits. You can use OpenAPIHub to initialize the PR for adding a new version.
    For more details refer to the wiki.

    @serbrech serbrech removed the ARMChangesRequested <valid label in PR review process>add this label when require changes after ARM review label Sep 18, 2023
    @openapi-workflow-bot openapi-workflow-bot bot added the WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required label Sep 18, 2023
    @serbrech serbrech added WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required WaitForReviewRevisit and removed WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required CI-BreakingChange-Python-Track2 CI-BreakingChange-Go CI-BreakingChange-JavaScript labels Sep 18, 2023
    @sjanamma sjanamma added the ARMSignedOff <valid label in PR review process>add this label when ARM approve updates after review label Sep 18, 2023
    @openapi-workflow-bot openapi-workflow-bot bot removed the WaitForARMFeedback <valid label in PR review process> add this label when ARM review is required label Sep 18, 2023
    @serbrech
    Copy link
    Member

    we'll wait for our manifest rollout before merging this PR since this adds a new resource.
    Thanks!

    @zman-ms zman-ms added MergeRequested and removed DoNotMerge <valid label in PR review process> use to hold merge after approval labels Sep 26, 2023
    @raosuhas raosuhas merged commit 3f4960b into main Sep 26, 2023
    27 of 30 checks passed
    @raosuhas raosuhas deleted the dev-aks-fleet-2023-08-15-preview branch September 26, 2023 01:13
    @openapi-pipeline-app
    Copy link

    Swagger pipeline restarted successfully, please wait for status update in this comment.

    jnlycklama pushed a commit that referenced this pull request Nov 8, 2023
    * Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-08-15-preview
    
    * Updates readme
    
    * Updates API version in new specs and examples
    
    * [Fleet][Dev] Strategy resource API (#25582)
    
    * Adds base for updating Microsoft.ContainerService/fleet from version preview/2023-06-15-preview to version 2023-07-15-preview
    
    * rebase
    
    * Updates API version in new specs and examples
    
    * new tsp files
    
    * new tsp files
    
    * readme files
    
    * copy example files
    
    * new example files
    
    * fix example files
    
    * compile
    
    * compile to add new example files
    
    * improve comments
    
    * format tsp files
    
    * re-compile
    
    * improve comments
    
    * visibility concistency
    
    * [Fleet] Add VMSize to hub profile (#25709)
    
    * add VMSize to hub profile
    * add VMSize examples
    * improve description
    * format
    
    * Add portal FQDN to fleet hub profile (#25766)
    
    Co-authored-by: nguyenmin <[email protected]>
    
    * [Fleet] Move VMSize into AgentProfile (#25805)
    
    * move vm size into agent profile
    
    * re-generate
    
    * [Fleet] Fix readme.md for 0815 (#25822)
    
    * fix readme
    
    * format
    
    ---------
    
    Co-authored-by: Minh Nguyen <[email protected]>
    Co-authored-by: nguyenmin <[email protected]>
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Labels
    ARMReview ARMSignedOff <valid label in PR review process>add this label when ARM approve updates after review CI-BreakingChange-Go CI-BreakingChange-JavaScript CI-MissingBaseCommit DoNotMerge <valid label in PR review process> use to hold merge after approval new-api-version ReadyForApiTest <valid label in PR review process>add this label when swagger and service APIs are ready for test resource-manager ShiftLeftViolation
    Projects
    None yet
    Development

    Successfully merging this pull request may close these issues.

    7 participants