Remove SHA1 workarounds from VMR build

These are no longer needed since dotnet/arcade#12940 Fixes: dotnet/source-build#3458
omajid · Jun 21, 2023 · 0adf983 · 0adf983
1 parent 2fb3af9
commit 0adf983
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 37 deletions.
diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml
@@ -47,12 +47,6 @@ parameters:
 - name: buildFromArchive
   type: boolean
 
-# Some distros like CentOS Stream 9 use OpenSSL 3.0 which disables SHA1 signing.
-# This option overrides that default configuration and enables it. See https://github.com/dotnet/installer/pull/15289
-- name: overrideDistroDisablingSha1
-  type: boolean
-  default: false
-
 # Use the previous version's SDK to build the current one
 - name: withPreviousSDK
   type: boolean
@@ -204,11 +198,6 @@ jobs:
         customRunArgs="$customRunArgs --network none"
       fi
 
-      # See https://github.com/dotnet/source-build/issues/3202
-      if [[ '${{ parameters.overrideDistroDisablingSha1 }}' == 'True' ]]; then
-        customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1"
-      fi
-
       if [[ '${{ parameters.enablePoison }}' == 'True' ]]; then
         customBuildArgs="$customBuildArgs --poison"
       fi

diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml
@@ -82,12 +82,11 @@ stages:
       buildFromArchive: false            # 🚫
       enablePoison: false                # 🚫
       excludeOmniSharpTests: true        # ✅
-      overrideDistroDisablingSha1: false # 🚫
       runOnline: true                    # ✅
       useMonoRuntime: false              # 🚫
       withPreviousSDK: false             # 🚫
 
-  - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+  - ${{ if ne(variables['Build.Reason'], 'fixme') }}:
 
     # CI - Stage 1 x64 legs ------------------------------------
 
@@ -104,7 +103,6 @@ stages:
         buildFromArchive: false            # ✅
         enablePoison: false                # 🚫
         excludeOmniSharpTests: true        # ✅
-        overrideDistroDisablingSha1: false # 🚫
         runOnline: false                   # 🚫
         useMonoRuntime: false              # 🚫
         withPreviousSDK: false             # 🚫
@@ -122,7 +120,6 @@ stages:
         buildFromArchive: false            # 🚫
         enablePoison: false                # 🚫
         excludeOmniSharpTests: true        # ✅
-        overrideDistroDisablingSha1: false # 🚫
         runOnline: true                    # ✅
         useMonoRuntime: false              # 🚫
         withPreviousSDK: true              # ✅
@@ -140,7 +137,6 @@ stages:
         buildFromArchive: true             # ✅
         enablePoison: false                # 🚫
         excludeOmniSharpTests: true        # ✅
-        overrideDistroDisablingSha1: false # 🚫
         runOnline: false                   # 🚫
         useMonoRuntime: false              # 🚫
         withPreviousSDK: false             # 🚫
@@ -158,7 +154,6 @@ stages:
         buildFromArchive: true             # ✅
         enablePoison: false                # 🚫
         excludeOmniSharpTests: true        # ✅
-        overrideDistroDisablingSha1: false # 🚫
         runOnline: false                   # 🚫
         useMonoRuntime: true               # ✅
         withPreviousSDK: false             # 🚫
@@ -176,7 +171,6 @@ stages:
         buildFromArchive: true             # ✅
         enablePoison: false                # 🚫
         excludeOmniSharpTests: false       # 🚫
-        overrideDistroDisablingSha1: true  # ✅
         runOnline: false                   # 🚫
         useMonoRuntime: false              # 🚫
         withPreviousSDK: false             # 🚫
@@ -194,7 +188,6 @@ stages:
         buildFromArchive: true             # ✅
         enablePoison: true                 # ✅
         excludeOmniSharpTests: false       # 🚫
-        overrideDistroDisablingSha1: false # 🚫
         runOnline: false                   # 🚫
         useMonoRuntime: false              # 🚫
         withPreviousSDK: false             # 🚫
@@ -212,28 +205,27 @@ stages:
         buildFromArchive: false            # 🚫
         enablePoison: false                # 🚫
         excludeOmniSharpTests: false       # 🚫
-        overrideDistroDisablingSha1: false # 🚫
         runOnline: false                   # 🚫
         useMonoRuntime: false              # 🚫
         withPreviousSDK: false             # 🚫
 
     # CI - Stage 1 arm64 Legs ------------------------------------
 
-    - template: ../jobs/vmr-build.yml
-      parameters:
-        buildName: Debian11_Offline_MsftSdk
-        isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
-        vmrBranch: ${{ variables.VmrBranch }}
-        architecture: arm64
-        pool: ${{ parameters.poolInternalArm64 }}
-        container: ${{ parameters.debian11Arm64Container }}
-        buildFromArchive: false            # 🚫
-        enablePoison: false                # 🚫
-        excludeOmniSharpTests: false       # 🚫
-        overrideDistroDisablingSha1: false # 🚫
-        runOnline: false                   # 🚫
-        useMonoRuntime: false              # 🚫
-        withPreviousSDK: false             # 🚫
+    - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
+      - template: ../jobs/vmr-build.yml
+        parameters:
+          buildName: Debian11_Offline_MsftSdk
+          isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }}
+          vmrBranch: ${{ variables.VmrBranch }}
+          architecture: arm64
+          pool: ${{ parameters.poolInternalArm64 }}
+          container: ${{ parameters.debian11Arm64Container }}
+          buildFromArchive: false            # 🚫
+          enablePoison: false                # 🚫
+          excludeOmniSharpTests: false       # 🚫
+          runOnline: false                   # 🚫
+          useMonoRuntime: false              # 🚫
+          withPreviousSDK: false             # 🚫
 
     # CI - Stage 2 x64 Legs ------------------------------------
 
@@ -250,7 +242,6 @@ stages:
         buildFromArchive: false            # 🚫
         enablePoison: false                # 🚫
         excludeOmniSharpTests: true        # ✅
-        overrideDistroDisablingSha1: false # 🚫
         runOnline: false                   # 🚫
         useMonoRuntime: false              # 🚫
         withPreviousSDK: false             # 🚫
@@ -269,7 +260,6 @@ stages:
         buildFromArchive: false            # 🚫
         enablePoison: false                # 🚫
         excludeOmniSharpTests: false       # 🚫
-        overrideDistroDisablingSha1: false # 🚫
         runOnline: false                   # 🚫
         useMonoRuntime: false              # 🚫
         withPreviousSDK: false             # 🚫