From 0bffd0189778b29cfc1629c0b82f30766c403e05 Mon Sep 17 00:00:00 2001
From: Jiashuo Li <4003950+jiasli@users.noreply.github.com>
Date: Mon, 7 Feb 2022 11:40:50 +0800
Subject: [PATCH 1/3] [Packaging] BREAKING CHANGE: Drop `jmespath-terminal`
 from docker image (#21206)

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e47e6b347df..580cd45e38a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,8 +43,7 @@ RUN apk add --no-cache bash openssh ca-certificates jq curl openssl perl git zip
 ARG JP_VERSION="0.1.3"
 
 RUN curl -L https://github.com/jmespath/jp/releases/download/${JP_VERSION}/jp-linux-amd64 -o /usr/local/bin/jp \
- && chmod +x /usr/local/bin/jp \
- && pip install --no-cache-dir --upgrade jmespath-terminal
+ && chmod +x /usr/local/bin/jp
 
 WORKDIR azure-cli
 COPY . /azure-cli

From 8caf4004ea9b56592a6bec4015427f3bacc5a87d Mon Sep 17 00:00:00 2001
From: Jiashuo Li <4003950+jiasli@users.noreply.github.com>
Date: Mon, 7 Feb 2022 17:04:46 +0800
Subject: [PATCH 2/3] {Packaging} Fix CI job "Test Yum Package" by using
 `centos7` (#21207)

---
 azure-pipelines.yml                       | 7 ++++---
 scripts/release/rpm/test_rpm_in_docker.sh | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ab0971455ae..0bb0b6d0855 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -743,9 +743,10 @@ jobs:
        YUM_FILE=$SYSTEM_ARTIFACTSDIRECTORY/yum/$YUM_NAME
 
        echo "== Test yum package on CentOS =="
-
-       docker pull centos:centos8
-       docker run --rm -e YUM_NAME=$YUM_NAME -v $SYSTEM_ARTIFACTSDIRECTORY/yum:/mnt/yum -v $(pwd):/azure-cli centos:centos8 /bin/bash "/azure-cli/scripts/release/rpm/test_rpm_in_docker.sh"
+      
+       IMAGE=centos:centos7
+       docker pull $IMAGE
+       docker run --rm -e YUM_NAME=$YUM_NAME -v $SYSTEM_ARTIFACTSDIRECTORY/yum:/mnt/yum -v $(pwd):/azure-cli $IMAGE /bin/bash "/azure-cli/scripts/release/rpm/test_rpm_in_docker.sh"
 
     displayName: 'Test Yum Package'
 
diff --git a/scripts/release/rpm/test_rpm_in_docker.sh b/scripts/release/rpm/test_rpm_in_docker.sh
index b0d17cc5e7a..9804a04209a 100644
--- a/scripts/release/rpm/test_rpm_in_docker.sh
+++ b/scripts/release/rpm/test_rpm_in_docker.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# This script should be run in a centos8 docker.
+# This script should be run in a centos7 docker.
 set -exv
 
 export USERNAME=azureuser
@@ -9,8 +9,8 @@ yum --nogpgcheck localinstall /mnt/yum/$YUM_NAME -y
 
 yum install git gcc python3-devel -y
 
-ln -s /usr/bin/python3 /usr/bin/python
-ln -s /usr/bin/pip3 /usr/bin/pip
+ln -s -f /usr/bin/python3 /usr/bin/python
+ln -s -f /usr/bin/pip3 /usr/bin/pip
 time az self-test
 time az --version
 

From 7c142b74ba8b5f20d521458690f8d3a2caa33996 Mon Sep 17 00:00:00 2001
From: Xing Zhou <Zhou.Xing@microsoft.com>
Date: Wed, 9 Feb 2022 15:00:44 +0800
Subject: [PATCH 3/3] Update azure-pipelines.yml for Azure Pipelines (#21230)

Pin version for cred scan
---
 azure-pipelines.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0bb0b6d0855..a1ee0b86478 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -52,6 +52,7 @@ jobs:
       inputs:
         toolMajorVersion: V2
         suppressionsFile: './scripts/ci/credscan/CredScanSuppressions.json'
+        toolVersionV2: '2.1.17'
     - task: ms-codeanalysis.vss-microsoft-security-code-analysis-devops.build-task-postanalysis.PostAnalysis@1
       displayName: 'Post Analysis'
       inputs: