Remove RHEL from the agent CI (#4408)

* remove rhel from ci * remove dockerfile * update config script
microsoft · Sep 1, 2023 · 9a7c358 · 9a7c358
1 parent d8e2b00
commit 9a7c358
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 152 deletions.
diff --git a/.azure-pipelines/build-job.yml b/.azure-pipelines/build-job.yml
@@ -24,7 +24,6 @@ parameters:
   - win
   - linux
   - linux-musl
-  - rhel.7.2
   - osx
 
 - name: arch

diff --git a/.azure-pipelines/pipeline.yml b/.azure-pipelines/pipeline.yml
@@ -23,12 +23,6 @@ parameters:
 - name: branch
   type: string
   default: ''
-- name: skipRhelRelease
-  type: boolean
-  default: true
-- name: releaseRhelOnly
-  type: boolean
-  default: false
 - name: testProxyAgent
   type: boolean
   default: false
@@ -52,9 +46,6 @@ parameters:
 - name: alpine_x64
   type: boolean
   default: true
-- name: rhel7_x64
-  type: boolean
-  default: true
 - name: macOS_x64
   type: boolean
   default: true
@@ -64,8 +55,6 @@ parameters:
 
 resources:
   containers:
-  - container: centos7
-    image: azpagentinfra/centos7:latest
   - container: alpine
     image: azpagentinfra/alpine:latest
 
@@ -85,6 +74,7 @@ stages:
       variables:
         DisableDockerDetector: true
         nugetMultiFeedWarnLevel: none
+      timeoutInMinutes: 300
       steps:
       - bash: |
           cd ./.azure-pipelines/scripts/
@@ -103,7 +93,7 @@ stages:
         displayName: Test Proxy Agent
 
   # Windows (x64)
-  - ${{ if and(parameters.win_x64, not(parameters.releaseRhelOnly)) }}:
+  - ${{ if parameters.win_x64 }}:
     - template: build-jobs.yml
       parameters:
         jobName: build_windows_x64
@@ -123,7 +113,7 @@ stages:
         buildAlternatePackage: ${{ parameters.buildAlternatePackage }}
 
   # Windows (x86)
-  - ${{ if and(parameters.win_x86, not(parameters.releaseRhelOnly)) }}:
+  - ${{ if parameters.win_x86 }}:
     - template: build-jobs.yml
       parameters:
         jobName: build_windows_x86
@@ -141,7 +131,7 @@ stages:
         buildAlternatePackage: ${{ parameters.buildAlternatePackage }}
 
   # Linux (x64)
-  - ${{ if and(parameters.linux_x64, not(parameters.releaseRhelOnly)) }}:
+  - ${{ if parameters.linux_x64 }}:
     - template: build-jobs.yml
       parameters:
         jobName: build_linux_x64
@@ -159,7 +149,7 @@ stages:
         buildAlternatePackage: ${{ parameters.buildAlternatePackage }}
 
   # Linux (ARM)
-  - ${{ if and(parameters.linux_arm, not(parameters.releaseRhelOnly)) }}:
+  - ${{ if parameters.linux_arm }}:
     - template: build-jobs.yml
       parameters:
         jobName: build_linux_arm
@@ -178,7 +168,7 @@ stages:
         buildAlternatePackage: ${{ parameters.buildAlternatePackage }}
 
   # Linux (ARM64)
-  - ${{ if and(parameters.linux_arm64, not(parameters.releaseRhelOnly)) }}:
+  - ${{ if parameters.linux_arm64 }}:
     - template: build-jobs.yml
       parameters:
         jobName: build_linux_arm64
@@ -216,27 +206,8 @@ stages:
         publishArtifacts: ${{ parameters.publishArtifacts }}
         buildAlternatePackage: false
 
-  # RHEL7 (x64)
-  - ${{ if parameters.rhel7_x64 }}:
-    - template: build-jobs.yml
-      parameters:
-        jobName: build_rhel7_x64
-        displayName: RHEL7 (x64)
-        pool:
-          vmImage: ubuntu-20.04
-        container: centos7
-        os: linux
-        arch: x64
-        branch: ${{ parameters.branch }}
-        componentDetection: false
-        unitTests: ${{ parameters.test }}
-        functionalTests: ${{ parameters.test }}
-        sign: false
-        publishArtifacts: ${{ parameters.publishArtifacts }}
-        buildAlternatePackage: ${{ parameters.buildAlternatePackage }}
-
-  # macOS x64
-  - ${{ if and(parameters.macOS_x64, not(parameters.releaseRhelOnly)) }}:
+  # macOS (x64)
+  - ${{ if parameters.macOS_x64 }}:
     - template: build-jobs.yml
       parameters:
         jobName: build_osx
@@ -253,12 +224,12 @@ stages:
         publishArtifacts: ${{ parameters.publishArtifacts }}
         buildAlternatePackage: ${{ parameters.buildAlternatePackage }}
 
-  # macOS arm64
+  # macOS (ARM64)
   - ${{ if parameters.macOS_arm64 }}:
     - template: build-jobs.yml
       parameters:
         jobName: build_osx_arm64
-        displayName: macOS (arm64)
+        displayName: macOS (ARM64)
         pool:
           vmImage: macOS-12
         os: osx

diff --git a/.vsts.ci.yml b/.vsts.ci.yml
@@ -1,4 +1,10 @@
 parameters:
+- name: testProxyAgent
+  type: boolean
+  displayName: Test Proxy Agent
+  default: true
+
+# Targets
 - name: win_x64
   type: boolean
   displayName: Windows (x64)
@@ -23,25 +29,14 @@ parameters:
   type: boolean
   displayName: Alpine (x64)
   default: true
-- name: rhel7_x64
-  type: boolean
-  displayName: RHEL 7 (x64)
-  default: false
 - name: macOS_x64
   type: boolean
   displayName: macOS (x64)
   default: true
 - name: macOS_arm64
   type: boolean
-  displayName: macOS (arm64)
+  displayName: macOS (ARM64)
   default: true
-- name: skipRhelRelease
-  type: boolean
-  default: true
-- name: testProxyAgent
-  type: boolean
-  default: true
-  displayName: Test Proxy Agent
 
 pr:
   branches:
@@ -57,14 +52,12 @@ extends:
     componentDetection: ${{ eq(variables['Build.Reason'], 'PullRequest') }}
     publishArtifacts: ${{ ne(variables['Build.Reason'], 'PullRequest') }}
     buildAlternatePackage: false
-    skipRhelRelease: ${{ parameters.skipRhelRelease }}
     testProxyAgent: ${{ parameters.testProxyAgent }}
     win_x64: ${{ parameters.win_x64 }}
     win_x86: ${{ parameters.win_x86 }}
     linux_x64: ${{ parameters.linux_x64 }}
     linux_arm: ${{ parameters.linux_arm }}
     linux_arm64: ${{ parameters.linux_arm64 }}
     alpine_x64: ${{ parameters.alpine_x64 }}
-    rhel7_x64: ${{ parameters.rhel7_x64 }}
     macOS_x64: ${{ parameters.macOS_x64 }}
     macOS_arm64: ${{ parameters.macOS_arm64 }}
diff --git a/.vsts.release.yml b/.vsts.release.yml
@@ -16,14 +16,6 @@ parameters:
   type: boolean
   default: false
   displayName: Build Stage Only
-- name: skipRhelRelease
-  type: boolean
-  default: true
-  displayName: Skip RHEL Release
-- name: releaseRhelOnly
-  type: boolean
-  default: false
-  displayName: Release RHEL Only
 
 - name: onlyGitHubRelease
   type: boolean
@@ -49,8 +41,6 @@ extends:
     test: ${{ not(parameters.skipTests) }}
     sign: true
     publishArtifacts: true
-    skipRhelRelease: ${{ parameters.skipRhelRelease }}
-    releaseRhelOnly: ${{ parameters.releaseRhelOnly }}
     testProxyAgent: ${{ parameters.testProxyAgent }}
 
     preBuildStages:

diff --git a/images/centos7/Dockerfile b/images/centos7/Dockerfile
diff --git a/images/readme.md b/images/readme.md
@@ -1,4 +1,4 @@
-# Docker Images For Building Agent
+# Docker Images for the Agent CI/CD Pipeline
 
 ## Docker Hub
 
@@ -7,13 +7,11 @@ In order to publish these images, you need to be a member of the organization `a
 ## How to Build
 
 ```bash
-docker build --tag azpagentinfra/alpine:latest ./images/alpine/
-docker build --tag azpagentinfra/centos7:latest ./images/centos7/
+docker build --tag "azpagentinfra/alpine:latest" ./images/alpine/
 ```
 
-## How to Publish
+## How to Push
 
 ```bash
-docker push azpagentinfra/alpine:latest
-docker push azpagentinfra/centos7:latest
+docker push "azpagentinfra/alpine:latest"
 ```
diff --git a/releaseNote.md b/releaseNote.md
@@ -6,7 +6,7 @@
 | Windows x64    | [vsts-agent-win-x64-<AGENT_VERSION>.zip](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-win-x64-<AGENT_VERSION>.zip) | <HASH> |
 | Windows x86    | [vsts-agent-win-x86-<AGENT_VERSION>.zip](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-win-x86-<AGENT_VERSION>.zip) | <HASH> |
 | macOS x64      | [vsts-agent-osx-x64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-osx-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
-| macOS arm64    | [vsts-agent-osx-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-osx-arm64-<AGENT_VERSION>.tar.gz) | <HASH> |
+| macOS ARM64    | [vsts-agent-osx-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-osx-arm64-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux x64      | [vsts-agent-linux-x64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-linux-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux ARM      | [vsts-agent-linux-arm-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-linux-arm-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux ARM64    | [vsts-agent-linux-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/vsts-agent-linux-arm64-<AGENT_VERSION>.tar.gz) | <HASH> |
@@ -35,7 +35,7 @@ C:\myagent> Add-Type -AssemblyName System.IO.Compression.FileSystem ; [System.IO
 ~/myagent$ tar xzf ~/Downloads/vsts-agent-osx-x64-<AGENT_VERSION>.tar.gz
 ```
 
-## macOS arm64
+## macOS ARM64
 
 ``` bash
 ~/$ mkdir myagent && cd myagent
@@ -82,7 +82,7 @@ See [notes](docs/node6.md) on Node version support for more details.
 | Windows x64 | [pipelines-agent-win-x64-<AGENT_VERSION>.zip](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-win-x64-<AGENT_VERSION>.zip) | <HASH> |
 | Windows x86 | [pipelines-agent-win-x86-<AGENT_VERSION>.zip](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-win-x86-<AGENT_VERSION>.zip) | <HASH> |
 | macOS x64   | [pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
-| macOS arm64 | [pipelines-agent-osx-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
+| macOS ARM64 | [pipelines-agent-osx-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-osx-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux x64   | [pipelines-agent-linux-x64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-linux-x64-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux ARM   | [pipelines-agent-linux-arm-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-linux-arm-<AGENT_VERSION>.tar.gz) | <HASH> |
 | Linux ARM64 | [pipelines-agent-linux-arm64-<AGENT_VERSION>.tar.gz](https://vstsagentpackage.azureedge.net/agent/<AGENT_VERSION>/pipelines-agent-linux-arm64-<AGENT_VERSION>.tar.gz) | <HASH> |
diff --git a/src/Misc/externals.sh b/src/Misc/externals.sh
@@ -198,7 +198,6 @@ else
         case $PACKAGERUNTIME in
             "linux-musl-x64") ARCH="linux-x64-musl";;
             "linux-x64") ARCH="linux-x64";;
-            "rhel.7.2-x64") ARCH="linux-x64";;
             "linux-arm") ARCH="linux-armv7l";;
             "linux-arm64") ARCH="linux-arm64";;
             "osx-x64") ARCH="darwin-x64";;