Rename mariner package to cm

PowerShell · Jun 8, 2022 · b3b9ff3 · b3b9ff3
1 parent d8d1d78
commit b3b9ff3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/tools/packages.microsoft.com/mapping.json b/tools/packages.microsoft.com/mapping.json
@@ -18,13 +18,13 @@
       {
           "url": "cbl-mariner-2.0-prod-Microsoft-x86_64",
           "distribution" : ["bionic"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm",
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm.x86_64.rpm",
           "channel" : "stable"
       },
       {
           "url": "cbl-mariner-2.0-preview-Microsoft-x86_64",
           "distribution" : ["bionic"],
-          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm1.x86_64.rpm",
+          "PackageFormat" : "PACKAGE_NAME-POWERSHELL_RELEASE-1.cm.x86_64.rpm",
           "channel" : "preview"
       },
       {

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
@@ -8,7 +8,7 @@ $packagingStrings = Import-PowerShellDataFile "$PSScriptRoot\packaging.strings.p
 Import-Module "$PSScriptRoot\..\Xml" -ErrorAction Stop -Force
 $DebianDistributions = @("deb")
 $RedhatFullDistributions = @("rh")
-$RedhatFddDistributions = @("cm1")
+$RedhatFddDistributions = @("cm")
 $RedhatDistributions = @()
 $RedhatDistributions += $RedhatFullDistributions
 $RedhatDistributions += $RedhatFddDistributions
@@ -1354,7 +1354,7 @@ function Get-PackageDependencies
                 "openssl-libs",
                 "libicu"
             )
-        } elseif ($Distribution -eq 'cm1') {
+        } elseif ($Distribution -eq 'cm') {
             # Taken from the list here:
             # https://github.com/dotnet/dotnet-docker/blob/d451d6e9427f58c8508f1297c862663a27eb609f/src/runtime-deps/6.0/cbl-mariner1.0/amd64/Dockerfile#L6
             $Dependencies = @(

diff --git a/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml b/tools/releaseBuild/azureDevOps/templates/release-ValidatePackageNames.yml
@@ -30,7 +30,7 @@ steps:
 - pwsh: |
     $message = @()
     Get-ChildItem $(System.ArtifactsDirectory)\* -recurse -filter *.rpm | ForEach-Object {
-        if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d\.\d\.\d(_[a-z]*\.\d+)?-1.(rh|cm1).x86_64\.rpm')
+        if($_.Name -notmatch 'powershell\-(preview-|lts-)?\d+\.\d+\.\d+(_[a-z]*\.\d+)?-1.(rh|cm).x86_64\.rpm')
         {
             $messageInstance = "$($_.Name) is not a valid package name"
             $message += $messageInstance