Merge remote-tracking branch 'upstream/release' into master

Author: azclibot

.azure-pipelines/templates/azdev_setup.yml

@@ -14,7 +14,7 @@ steps:
       chmod +x env/bin/activate
       . env/bin/activate
 
-      pip install -q azdev==0.1.26
+      pip install -q azdev==0.1.28
       azdev --version
 
       if [ -z "$CLI_EXT_REPO_PATH" ]; then

.github/CODEOWNERS

@@ -22,7 +22,7 @@
 /src/azure-cli/azure/cli/command_modules/cloud/ @jiasli @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/container/ @zhoxing-ms
 /src/azure-cli/azure/cli/command_modules/consumption/ @sandeepnl
-/src/azure-cli/azure/cli/command_modules/dls/ @lewu-msft
+/src/azure-cli/azure/cli/command_modules/dls/ @akharit @rahuldutta90 @Juliehzl @jsntcy
 /src/azure-cli/azure/cli/command_modules/extension/ @fengzhou-msft @haroldrandom
 /src/azure-cli/azure/cli/command_modules/keyvault/ @bim-msft @fengzhou-msft
 /src/azure-cli/azure/cli/command_modules/monitor/ @MyronFanQiu @jsntcy

azure-pipelines.yml

@@ -574,7 +574,7 @@ jobs:
 
 - job: TestHomebrewPackage
   displayName: Test Homebrew Package
-  timeoutInMinutes: 120
+  timeoutInMinutes: 180
   dependsOn: BuildHomebrewFormula
   condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual'))
   pool:
@@ -656,8 +656,8 @@ jobs:
 
     displayName: 'Test Yum Package'
 
-- job: BuildUbuntuPackages
-  displayName: Build Ubuntu Packages
+- job: BuildDebPackages
+  displayName: Build Deb Packages
 
   dependsOn: BuildPythonWheel
   condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual'))
@@ -666,82 +666,83 @@ jobs:
   strategy:
     matrix:
       Xenial:
+        deb_system: ubuntu
         distro: xenial
       Trusty:
+        deb_system: ubuntu
         distro: trusty
       Bionic:
+        deb_system: ubuntu
         distro: bionic
       Eoan:
+        deb_system: ubuntu
         distro: eoan
       Focal:
+        deb_system: ubuntu
         distro: focal
-  steps:
-  - task: DownloadPipelineArtifact@1
-    displayName: 'Download Build Artifacts'
-    inputs:
-      TargetPath: '$(Build.ArtifactStagingDirectory)/pypi'
-      artifactName: pypi
-
-  - task: Bash@3
-    displayName: 'Build Ubuntu $(distro) Package'
-    inputs:
-      targetType: 'filePath'
-      filePath: scripts/release/debian/pipeline.sh
-    env:
-      DISTRO: $(distro)
-      DISTRO_BASE_IMAGE: ubuntu:$(distro)
-
-  - task: PublishPipelineArtifact@0
-    displayName: 'Publish Artifact: debian'
-    inputs:
-      TargetPath: $(Build.ArtifactStagingDirectory)
-      ArtifactName: ubuntu-$(distro)
-
-- job: BuildDebianPackages
-  displayName: Build Debian Packages
-
-  dependsOn: BuildPythonWheel
-  condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual'))
-  pool:
-    vmImage: 'ubuntu-16.04'
-  strategy:
-    matrix:
       Jessie:
+        deb_system: debian
         distro: jessie
       Stretch:
+        deb_system: debian
         distro: stretch
       Buster:
-        distro: buster
+        deb_system: debian
+        distro: buster 
   steps:
   - task: DownloadPipelineArtifact@1
     displayName: 'Download Build Artifacts'
     inputs:
       TargetPath: '$(Build.ArtifactStagingDirectory)/pypi'
       artifactName: pypi
 
-
   - task: Bash@3
-    displayName: 'Build Debian $(distro) Package'
+    displayName: 'Build $(deb_system) $(distro) Package'
     inputs:
       targetType: 'filePath'
       filePath: scripts/release/debian/pipeline.sh
     env:
       DISTRO: $(distro)
-      DISTRO_BASE_IMAGE: debian:$(distro)
+      DISTRO_BASE_IMAGE: $(deb_system):$(distro)
 
   - task: PublishPipelineArtifact@0
     displayName: 'Publish Artifact: debian'
     inputs:
       TargetPath: $(Build.ArtifactStagingDirectory)
-      ArtifactName: debian-$(distro)
+      ArtifactName: $(deb_system)-$(distro)
 
 - job: TestDebPackages
   displayName: Test Deb Packages
 
   dependsOn:
-   - BuildUbuntuPackages
-   - BuildDebianPackages
+   - BuildDebPackages
   condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI', 'Manual'))
+  strategy:
+    matrix:
+      Xenial:
+        deb_system: ubuntu
+        distro: xenial
+      Trusty:
+        deb_system: ubuntu
+        distro: trusty
+      Bionic:
+        deb_system: ubuntu
+        distro: bionic
+      Eoan:
+        deb_system: ubuntu
+        distro: eoan
+      Focal:
+        deb_system: ubuntu
+        distro: focal
+      Jessie:
+        deb_system: debian
+        distro: jessie
+      Stretch:
+        deb_system: debian
+        distro: stretch
+      Buster:
+        deb_system: debian
+        distro: buster      
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
@@ -752,86 +753,24 @@ jobs:
       artifactName: metadata
 
   - task: DownloadPipelineArtifact@1
-    displayName: 'Download Debian:Stretch Build'
+    displayName: 'Download $(deb_system):$(distro) Build'
     inputs:
       TargetPath: '$(Build.ArtifactStagingDirectory)/debian'
-      artifactName: debian-stretch
+      artifactName: $(deb_system)-$(distro)
 
-  - task: DownloadPipelineArtifact@1
-    displayName: 'Download Debian:Buster Build'
-    inputs:
-      TargetPath: '$(Build.ArtifactStagingDirectory)/debian'
-      artifactName: debian-buster
-
-  - task: DownloadPipelineArtifact@1
-    displayName: 'Download Debian:Jessie Builds'
-    inputs:
-      TargetPath: '$(Build.ArtifactStagingDirectory)/debian'
-      artifactName: debian-jessie
-
-  - task: DownloadPipelineArtifact@1
-    displayName: 'Download Ubuntu:Bionic Builds'
-    inputs:
-      TargetPath: '$(Build.ArtifactStagingDirectory)/debian'
-      artifactName: ubuntu-bionic
-
-  - task: DownloadPipelineArtifact@1
-    displayName: 'Download Ubuntu:Xenial Builds'
-    inputs:
-      TargetPath: '$(Build.ArtifactStagingDirectory)/debian'
-      artifactName: ubuntu-xenial
-
-  - task: DownloadPipelineArtifact@1
-    displayName: 'Download Ubuntu:Trusty Builds'
-    inputs:
-      TargetPath: '$(Build.ArtifactStagingDirectory)/debian'
-      artifactName: ubuntu-trusty
-
-  - task: DownloadPipelineArtifact@1
-    displayName: 'Download Ubuntu:Eoan Builds'
-    inputs:
-      TargetPath: '$(Build.ArtifactStagingDirectory)/debian'
-      artifactName: ubuntu-eoan
-
-  - task: DownloadPipelineArtifact@1
-    displayName: 'Download Ubuntu:Focal Builds'
+  - task: Bash@3
+    displayName: 'Test $(deb_system) $(distro) Package'
+    env:
+      DISTRO: $(distro)
+      DISTRO_BASE_IMAGE: $(deb_system):$(distro)
     inputs:
-      TargetPath: '$(Build.ArtifactStagingDirectory)/debian'
-      artifactName: ubuntu-focal
-
-  - bash: |
-       set -exv
-
-       CLI_VERSION=`cat $SYSTEM_ARTIFACTSDIRECTORY/metadata/version`
-
-       DISTROS=(jessie stretch xenial trusty)
-       BASE_IMAGES=(debian:jessie debian:stretch ubuntu:xenial ubuntu:trusty)
-
-       # Distros that don't require libssl1.1
-       for i in ${!DISTROS[@]}; do
-           echo "== Test debian package on ${DISTROS[$i]} =="
-
-           DEB_FILE=$SYSTEM_ARTIFACTSDIRECTORY/debian/azure-cli_$CLI_VERSION-1~${DISTROS[$i]}_all.deb
-
-           docker pull ${BASE_IMAGES[$i]}
-
-           docker run --rm -v $SYSTEM_ARTIFACTSDIRECTORY/debian:/mnt/artifacts ${BASE_IMAGES[$i]} /bin/bash -c "apt-get update && apt-get install -y apt-transport-https && dpkg -i /mnt/artifacts/azure-cli_$CLI_VERSION-1~${DISTROS[$i]}_all.deb && time az self-test && time az --version && sleep 5"
-       done
-
-       # Distros that do require libssl1.1
-       DISTROS=(bionic buster eoan focal)
-       BASE_IMAGES=(ubuntu:bionic debian:buster ubuntu:eoan ubuntu:focal)
-
-       for i in ${!DISTROS[@]}; do
-           echo "== Test debian package on ${DISTROS[$i]} =="
-
-           DEB_FILE=$SYSTEM_ARTIFACTSDIRECTORY/debian/azure-cli_$CLI_VERSION-1~${DISTROS[$i]}_all.deb
-
-           docker pull ${BASE_IMAGES[$i]}
-
-           docker run --rm -v $SYSTEM_ARTIFACTSDIRECTORY/debian:/mnt/artifacts ${BASE_IMAGES[$i]} /bin/bash -c "apt-get update && apt-get install -y libssl1.1 apt-transport-https && dpkg -i /mnt/artifacts/azure-cli_$CLI_VERSION-1~${DISTROS[$i]}_all.deb && time az self-test && time az --version && sleep 5"
-       done
-    displayName: 'Bash Script'
+      targetType: 'inline'
+      script: |
+        set -exv
+        CLI_VERSION=`cat $SYSTEM_ARTIFACTSDIRECTORY/metadata/version`
+        echo "== Test debian package on ${DISTRO} =="
+        docker pull ${DISTRO_BASE_IMAGE}
+        docker run --rm -e DISTRO=${DISTRO} -e CLI_VERSION=$CLI_VERSION -v $SYSTEM_ARTIFACTSDIRECTORY/debian:/mnt/artifacts -v $(pwd):/azure-cli ${DISTRO_BASE_IMAGE} /bin/bash "/azure-cli/scripts/release/debian/test_deb_in_docker.sh"
 
 - job: CheckStyle
   displayName: "Check CLI Style"

pylintrc

@@ -14,7 +14,8 @@ disable=
     cyclic-import,
     too-many-arguments,
     invalid-name,
-    duplicate-code
+    duplicate-code,
+    bad-option-value
 
 [FORMAT]
 max-line-length=120

scripts/live_test/CLITest.yml

@@ -7,13 +7,13 @@ trigger:
     exclude:
     - '*'
 
-schedules:
-- cron: "0 18 * * 5"
-  displayName: Weekly Friday test
-  branches:
-    include:
-    - CLITest
-  always: true
+#schedules:
+#- cron: "0 18 * * 5"
+#  displayName: Weekly Friday test
+#  branches:
+#    include:
+#    - CLITest
+#  always: true
 
 jobs:
 - job: LiveTestPython38
@@ -221,6 +221,7 @@ jobs:
 
 - job: SendEmail
   displayName: Send email
+  timeoutInMinutes: 180
   dependsOn: LiveTestPython38
   condition: succeededOrFailed()
   steps:
@@ -246,7 +247,7 @@ jobs:
         python /home/vsts/work/1/s/scripts/live_test/sendemail.py "$(SENDGRID_KEY)" "$(Build.BuildId)" "$(USER_REPO)" "$(USER_BRANCH)" "$(USER_TARGET)" "$(USER_LIVE)" "$(System.ArtifactsDirectory)" "$(Build.RequestedForEmail)" "$(ACCOUNT_KEY)"
         # python /home/vsts/work/1/s/scripts/live_test/upload.py "$(System.ArtifactsDirectory)" "$(ACCOUNT_KEY)" "$(USER_LIVE)"
         # Clean resources
-        if [[ "$(USER_LIVE)" == "--live" ]]; then
+        if [[ "$(USER_LIVE)" == "--live" && "$(USER_TARGET)" == "" ]]; then
           python /home/vsts/work/1/s/scripts/live_test/clean.py
         fi
 #    - task: AzureCLI@2

scripts/live_test/HISTORY.rst

@@ -0,0 +1,13 @@
+.. :changelog:
+
+Release History
+===============
+
+0.1.0
+++++++
+
+* Remove schedule in debug mode.
+* Add timeout configuration in SendEmail job to avoid timeout.
+* Update clean up trigger condition.
+* Update email receiver rule.
+* Refactor data summary logic.