[Packaging] Revert Azure CLI Docker image based on Azure Linux 4.0 (#33831)

Co-authored-by: Mansoor Sarfraz <msarfraz+microsoft@microsoft.com>

Author: msarfraz

azure-pipelines.yml

@@ -352,12 +352,12 @@ jobs:
   strategy:
     matrix:
       ${{ each arch in parameters.architectures }}:
-        Azure Linux 4.0 ${{ arch.name }}:
+        Azure Linux 3.0 ${{ arch.name }}:
           pool: ${{ arch.pool }}
-          artifactName: docker-azurelinux4.0-${{ arch.value }}
+          artifactName: docker-azurelinux3.0-${{ arch.value }}
           dockerfile: azure-linux.dockerfile
-          packageArtifactName: rpm-azurelinux4.0-${{ arch.value }}
-          image: mcr.microsoft.com/azurelinux-beta/base/core:4.0
+          packageArtifactName: rpm-azurelinux3.0-${{ arch.value }}
+          image: mcr.microsoft.com/azurelinux/base/core:3.0
   pool:
     name: $(pool)
   steps:
@@ -396,9 +396,9 @@ jobs:
   strategy:
     matrix:
       ${{ each arch in parameters.architectures }}:
-        Azure Linux 4.0 ${{ arch.name }}:
+        Azure Linux 3.0 ${{ arch.name }}:
           pool: ${{ arch.pool }}
-          artifactName: docker-azurelinux4.0-${{ arch.value }}
+          artifactName: docker-azurelinux3.0-${{ arch.value }}
   pool:
     name: $(pool)
   steps:
@@ -776,9 +776,9 @@ jobs:
   strategy:
     matrix:
       ${{ each arch in parameters.architectures }}:
-        Azure Linux 4.0 ${{ arch.name }}:
-          image: mcr.microsoft.com/azurelinux-beta/base/core:4.0
-          artifact: rpm-azurelinux4.0-${{ arch.value }}
+        Azure Linux 3.0 ${{ arch.name }}:
+          image: mcr.microsoft.com/azurelinux/base/core:3.0
+          artifact: rpm-azurelinux3.0-${{ arch.value }}
           pool: ${{ arch.pool }}
   pool:
     name: $(pool)
@@ -822,9 +822,9 @@ jobs:
   strategy:
     matrix:
       ${{ each arch in parameters.architectures }}:
-        Azure Linux 4.0 ${{ arch.name }}:
-          image: mcr.microsoft.com/azurelinux-beta/base/core:4.0
-          artifact: rpm-azurelinux4.0-${{ arch.value }}
+        Azure Linux 3.0 ${{ arch.name }}:
+          image: mcr.microsoft.com/azurelinux/base/core:3.0
+          artifact: rpm-azurelinux3.0-${{ arch.value }}
           pool: ${{ arch.pool }}
   steps:
   - task: DownloadPipelineArtifact@1

scripts/release/rpm/README.md

@@ -36,7 +36,7 @@ docker run azure/azure-cli:fedora29-builder cat /root/rpmbuild/RPMS/x86_64/azure
 
 _Azure Linux:_
 ```bash
-docker run azure/azure-cli:azurelinux-builder cat /root/rpmbuild/RPMS/x86_64/azure-cli-dev-1.azl4.x86_64.rpm > ./bin/azure-cli-dev-1.azl4.x86_64.rpm
+docker run azure/azure-cli:azurelinux-builder cat /usr/src/azl/RPMS/x86_64/azure-cli-dev-1.azl3.x86_64.rpm > ./bin/azure-cli-dev-1.azl3.x86_64.rpm
 ```
 
 This launches a container running from the image built and tagged by the previous command, prints the contents of the

scripts/release/rpm/azurelinux.dockerfile

@@ -1,4 +1,4 @@
-ARG image=mcr.microsoft.com/azurelinux-beta/base/core:4.0
+ARG image=mcr.microsoft.com/azurelinux/base/core:3.0
 
 FROM ${image} AS build-env
 ARG cli_version=dev
@@ -16,15 +16,15 @@ WORKDIR /azure-cli
 
 COPY . .
 
-# Azure Linux 4's python3 is 3.12, the rpm paths are
-#   /root/rpmbuild/RPMS/x86_64/azure-cli-2.63.0-1.azl4.x86_64.rpm
-#   /root/rpmbuild/RPMS/aarch64/azure-cli-2.63.0-1.azl4.aarch64.rpm
+# Azure Linux 3's python3 is 3.12, the rpm paths are
+#   /usr/src/azl/RPMS/x86_64/azure-cli-2.63.0-1.azl3.x86_64.rpm
+#   /usr/src/azl/RPMS/aarch64/azure-cli-2.63.0-1.azl3.aarch64.rpm
 RUN --mount=type=secret,id=PIP_INDEX_URL export PIP_INDEX_URL=$(cat /run/secrets/PIP_INDEX_URL) && \
     dos2unix ./scripts/release/rpm/azure-cli.spec && \
     REPO_PATH=$(pwd) CLI_VERSION=$cli_version PYTHON_PACKAGE=python3 PYTHON_CMD=python3 \
     rpmbuild -v -bb --clean scripts/release/rpm/azure-cli.spec && \
-    cp /root/rpmbuild/RPMS/*/azure-cli-${cli_version}-1.*.rpm /azure-cli-dev.rpm && \
-    mkdir /out && cp /root/rpmbuild/RPMS/*/azure-cli-${cli_version}-1.*.rpm /out/
+    cp /usr/src/*/RPMS/*/azure-cli-${cli_version}-1.*.rpm /azure-cli-dev.rpm && \
+    mkdir /out && cp /usr/src/*/RPMS/*/azure-cli-${cli_version}-1.*.rpm /out/
 
 FROM ${image} AS execution-env
 

scripts/release/rpm/pipeline_azurelinux.sh

@@ -6,7 +6,7 @@ set -exv
 
 : "${BUILD_STAGINGDIRECTORY:?BUILD_STAGINGDIRECTORY environment variable not set.}"
 
-# IMAGE should be Azure Linux docker image url, such as mcr.microsoft.com/azurelinux-beta/base/core:4.0
+# IMAGE should be Azure Linux docker image url, such as mcr.microsoft.com/azurelinux/base/core:3.0
 : "${IMAGE:?IMAGE environment variable not set.}"
 
 CLI_VERSION=`cat src/azure-cli/azure/cli/__main__.py | grep __version__ | sed s/' '//g | sed s/'__version__='// |  sed s/\"//g`