Merge remote-tracking branch 'azure/dev' into at-scope

Author: jiasli

.github/actions/env-setup/action.yml

@@ -0,0 +1,37 @@
+name: GH Azdev Setup
+description: 'azdev env setup'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Check Init GH Event
+      env:
+        action: ${{ toJSON(github.event.action) }}
+        label: ${{ toJSON(github.event.label) }}
+      shell: bash
+      run: |
+        echo start azdev env setup
+    - name: Checkout CLI repo
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0 # checkout all branches
+        ref: ${{ github.event.pull_request.head.ref }}
+        repository: ${{ github.event.pull_request.head.repo.full_name }}  # checkout pull request branch
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.12"
+    - name: Install azdev
+      shell: bash
+      run: | 
+        python -m pip install --upgrade pip
+        set -ev
+        python -m venv env
+        chmod +x env/bin/activate
+        source ./env/bin/activate
+        pip install azdev
+        azdev --version
+        cd ../
+        azdev setup -c azure-cli --debug
+        az --version
+        pip list -v

.github/policies/resourceManagement.yml

@@ -1176,9 +1176,11 @@ configuration:
         - mentionUsers:
             mentionees:
             - toddysm
-            - luisdlp
             - northtyphoon
+            - luisdlp
             - terencet-dev
+            - shizhMSFT
+            - JXavierMSFT
             replyTemplate: Thanks for the feedback! We are routing this to the appropriate team for follow-up. cc ${mentionees}.
             assignMentionees: False
       - if:
@@ -4423,7 +4425,19 @@ configuration:
           isRegex: True
       then:
       - requestReview:
-          reviewer: wangzelin007
+          reviewer: northtyphoon
+      - requestReview:
+          reviewer: terencet-dev
+      - requestReview:
+          reviewer: JXavierMSFT
+      - requestReview:
+          reviewer: toddysm
+      - requestReview:
+          reviewer: rosanch
+      - requestReview:
+          reviewer: yanzhudd
+      - requestReview:
+          reviewer: shizhMSFT
       - requestReview:
           reviewer: zhoxing-ms
       - requestReview:

.github/workflows/AzdevLinter.yml

@@ -0,0 +1,61 @@
+name: GH Check CLI Linter
+on:
+  pull_request_target:
+    types: [opened, labeled, unlabeled, synchronize]
+    branches:
+      - dev
+
+permissions: {}
+
+jobs:
+  azdev-linter:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+      contents: read
+    steps:
+      - name: Checkout CLI repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          sparse-checkout: |
+            .github
+      - name: Azdev Env Setup
+        uses: ./.github/actions/env-setup
+      - name: Get Base Branch
+        env:
+          bash_sha: ${{ github.event.pull_request.base.sha }}
+          base_branch: ${{ github.event.pull_request.base.ref }}
+          base_repo: ${{ github.event.pull_request.base.repo.clone_url }}
+          base_branch_pre: "upstream"
+          diff_sha: ${{ github.event.pull_request.head.sha }}
+          diff_branch: ${{ github.event.pull_request.head.ref }}
+          repo_full_name: ${{ github.event.pull_request.head.repo.full_name }}
+        run: |
+          set -x
+          git --version
+          git log --oneline | head -n 10
+          git branch -a
+          git fetch "$base_repo" "$base_branch":"$base_branch_pre"/"$base_branch"
+          git checkout "$base_branch_pre"/"$base_branch"
+      - name: Run Azdev Style
+        env:
+          pr_label_list: ${{ toJson(github.event.pull_request.labels.*.name) }}
+          pr_user: ${{ github.event.pull_request.user.login }}
+          base_branch: ${{ github.event.pull_request.base.ref }}
+          base_branch_pre: "upstream"
+          diff_branch: ${{ github.event.pull_request.head.ref }}
+        run: |
+          chmod +x env/bin/activate
+          source ./env/bin/activate
+          set -ev
+
+          git checkout -f "$diff_branch"
+          # always use the latest scripts from base branch
+          git checkout "$base_branch_pre"/"$base_branch" -- scripts
+          git checkout "$base_branch_pre"/"$base_branch" -- .github
+          
+          python scripts/ci/service_name.py
+          merge_base=$(git merge-base HEAD "$base_branch_pre"/"$base_branch")
+          echo merge_base: "$merge_base"
+          azdev linter --ci-exclusions --min-severity medium --repo ./ --src "$diff_branch" --tgt "$merge_base"

.github/workflows/AzdevStyle.yml

@@ -0,0 +1,60 @@
+name: GH Check CLI Style
+on:
+  pull_request_target:
+    types: [opened, labeled, unlabeled, synchronize]
+    branches:
+      - dev
+
+permissions: {}
+
+jobs:
+  azdev-style:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+      contents: read
+    steps:
+      - name: Checkout CLI repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          sparse-checkout: |
+            .github
+      - name: Azdev Env Setup
+        uses: ./.github/actions/env-setup
+      - name: Get Base Branch
+        env:
+          bash_sha: ${{ github.event.pull_request.base.sha }}
+          base_branch: ${{ github.event.pull_request.base.ref }}
+          base_repo: ${{ github.event.pull_request.base.repo.clone_url }}
+          base_branch_pre: "upstream"
+          diff_sha: ${{ github.event.pull_request.head.sha }}
+          diff_branch: ${{ github.event.pull_request.head.ref }}
+          repo_full_name: ${{ github.event.pull_request.head.repo.full_name }}
+        run: |
+          set -x
+          git --version
+          git log --oneline | head -n 10
+          git branch -a
+          git fetch "$base_repo" "$base_branch":"$base_branch_pre"/"$base_branch"
+          git checkout "$base_branch_pre"/"$base_branch"
+      - name: Run Azdev Style
+        env:
+          pr_label_list: ${{ toJson(github.event.pull_request.labels.*.name) }}
+          pr_user: ${{ github.event.pull_request.user.login }}
+          base_branch: ${{ github.event.pull_request.base.ref }}
+          base_branch_pre: "upstream"
+          diff_branch: ${{ github.event.pull_request.head.ref }}
+        run: |
+          chmod +x env/bin/activate
+          source ./env/bin/activate
+          set -ev
+
+          git checkout -f "$diff_branch"
+          # always use the latest scripts from base branch
+          git checkout "$base_branch_pre"/"$base_branch" -- scripts
+          git checkout "$base_branch_pre"/"$base_branch" -- .github
+          merge_base=$(git merge-base HEAD "$base_branch_pre"/"$base_branch")
+          echo merge_base: "$merge_base"
+          # check azdev style on diff mod 
+          azdev style

azure-pipelines-full-tests.yml

@@ -16,63 +16,6 @@ variables:
 - template: ${{ variables.Pipeline.Workspace }}/.azure-pipelines/templates/variables.yml
 
 jobs:
-- job: AutomationTest20200901
-  displayName: Automation Test (Profile 2020-09-01)
-  timeoutInMinutes: 120
-  pool:
-    name: ${{ variables.ubuntu_pool }}
-  strategy:
-    matrix:
-      Python39:
-        python.version: '3.9'
-      Python312:
-        python.version: '3.12'
-  steps:
-  - template: .azure-pipelines/templates/automation_test.yml
-    parameters:
-      pythonVersion: '$(python.version)'
-      profile: '2020-09-01-hybrid'
-      fullTest: true
-      jobName: 'FullTest'
-
-- job: AutomationTest20190301
-  displayName: Automation Test (Profile 2019-03-01)
-  timeoutInMinutes: 120
-  pool:
-    name: ${{ variables.ubuntu_pool }}
-  strategy:
-    matrix:
-      Python39:
-        python.version: '3.9'
-      Python312:
-        python.version: '3.12'
-  steps:
-  - template: .azure-pipelines/templates/automation_test.yml
-    parameters:
-      pythonVersion: '$(python.version)'
-      profile: '2019-03-01-hybrid'
-      fullTest: true
-      jobName: 'FullTest'
-
-- job: AutomationTest20180301
-  displayName: Automation Test (Profile 2018-03-01)
-  timeoutInMinutes: 120
-  pool:
-    name: ${{ variables.ubuntu_pool }}
-  strategy:
-    matrix:
-      Python39:
-        python.version: '3.9'
-      Python312:
-        python.version: '3.12'
-  steps:
-  - template: .azure-pipelines/templates/automation_test.yml
-    parameters:
-      pythonVersion: '$(python.version)'
-      profile: '2018-03-01-hybrid'
-      fullTest: true
-      jobName: 'FullTest'
-
 - job: AutomationFullTestPython39ProfileLatest
   displayName: Automation Full Test Python39 Profile Latest
   timeoutInMinutes: 9999

azure-pipelines.yml

@@ -816,13 +816,13 @@ jobs:
           dockerfile: ubi
           image: registry.access.redhat.com/ubi8/ubi:8.4
           artifact: rpm-ubi8-${{ arch.value }}
-          python_package: python39
+          python_package: python3.12
           pool: ${{ arch.pool }}
         Red Hat Universal Base Image 9 ${{ arch.name }}:
           dockerfile: ubi
           image: registry.access.redhat.com/ubi9/ubi:9.0.0
           artifact: rpm-ubi9-${{ arch.value }}
-          python_package: python3.9
+          python_package: python3.12
           pool: ${{ arch.pool }}
   steps:
   - bash: ./scripts/ci/install_docker.sh
@@ -864,17 +864,17 @@ jobs:
           artifact: rpm-ubi8-${{ arch.value }}
           distro: el8
           image: registry.access.redhat.com/ubi8/ubi:8.4
-          python_package: python39
-          python_cmd: python3.9
-          pip_cmd: pip3.9
+          python_package: python3.12
+          python_cmd: python3.12
+          pip_cmd: pip3.12
           pool: ${{ arch.pool }}
         Red Hat Universal Base Image 9 ${{ arch.name }}:
           artifact: rpm-ubi9-${{ arch.value }}
           distro: el9
           image: registry.access.redhat.com/ubi9/ubi:9.0.0
-          python_package: python3.9
-          python_cmd: python3.9
-          pip_cmd: pip3.9
+          python_package: python3.12
+          python_cmd: python3.12
+          pip_cmd: pip3.12
           pool: ${{ arch.pool }}
   steps:
   - task: DownloadPipelineArtifact@1
@@ -913,12 +913,6 @@ jobs:
     matrix:
       ${{ each arch in parameters.architectures }}:
         # https://wiki.ubuntu.com/Releases
-        Focal ${{ arch.name }}:
-          # 20.04
-          deb_system: ubuntu
-          distro: focal
-          arch: ${{ arch.value }}
-          pool: ${{ arch.pool }}
         Jammy ${{ arch.name }}:
           # 22.04
           deb_system: ubuntu
@@ -982,11 +976,6 @@ jobs:
   strategy:
     matrix:
       ${{ each arch in parameters.architectures }}:
-        Focal ${{ arch.name }}:
-          deb_system: ubuntu
-          distro: focal
-          arch: ${{ arch.value }}
-          pool: ${{ arch.pool }}
         Jammy ${{ arch.name }}:
           deb_system: ubuntu
           distro: jammy

build_scripts/windows/scripts/patch_models_v2.py

@@ -245,7 +245,7 @@ def find_models_to_change(module_name):
         return [
             importlib.import_module('.'+label+'.models', main_module.__name__)
             for (_, label, ispkg) in pkgutil.iter_modules(main_module.__path__)
-            if ispkg and label != 'aio'
+            if ispkg and label != 'aio' and label != '_utils'
         ]