From d85ce1fd1db6976a0ab0892e92980c2817cb8093 Mon Sep 17 00:00:00 2001 From: jiasli <4003950+jiasli@users.noreply.github.com> Date: Mon, 7 Feb 2022 12:13:28 +0800 Subject: [PATCH 1/3] centos7 --- azure-pipelines.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 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' From d65256f48b79bb3d51a3d7ac7ec843a8b1a7a58d Mon Sep 17 00:00:00 2001 From: jiasli <4003950+jiasli@users.noreply.github.com> Date: Mon, 7 Feb 2022 12:23:57 +0800 Subject: [PATCH 2/3] update comment --- scripts/release/rpm/test_rpm_in_docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release/rpm/test_rpm_in_docker.sh b/scripts/release/rpm/test_rpm_in_docker.sh index b0d17cc5e7a..323f6dc2d0c 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 From 4aa18a1810aabbeabc042ac03386b5b9b2a1da11 Mon Sep 17 00:00:00 2001 From: jiasli <4003950+jiasli@users.noreply.github.com> Date: Mon, 7 Feb 2022 14:05:44 +0800 Subject: [PATCH 3/3] force link --- scripts/release/rpm/test_rpm_in_docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/release/rpm/test_rpm_in_docker.sh b/scripts/release/rpm/test_rpm_in_docker.sh index 323f6dc2d0c..9804a04209a 100644 --- a/scripts/release/rpm/test_rpm_in_docker.sh +++ b/scripts/release/rpm/test_rpm_in_docker.sh @@ -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