chore(ci): use vault.centos.org for CentOS 7

beaker-project · Aug 3, 2024 · 4797525 · 4797525
1 parent 4fa92c5
commit 4797525
Show file tree

Hide file tree

Showing 3 changed files with 96 additions and 8 deletions.
diff --git a/.github/centos7-repo-files/CentOS-Base.repo b/.github/centos7-repo-files/CentOS-Base.repo
@@ -0,0 +1,49 @@
+# NOTE: This has been modified to use `vault.centos.org` as `mirrorlist.centos.org` is gone
+#
+# CentOS-Base.repo
+#
+# The mirror system uses the connecting IP address of the client and the
+# update status of each mirror to pick mirrors that are updated to and
+# geographically close to the client.  You should use this for CentOS updates
+# unless you are manually picking other mirrors.
+#
+# If the mirrorlist= does not work for you, as a fall back you can try the
+# remarked out baseurl= line instead.
+#
+#
+
+[base]
+name=CentOS-$releasever - Base
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=os&infra=$infra
+#baseurl=http://mirror.centos.org/centos/$releasever/os/$basearch/
+baseurl=http://vault.centos.org/centos/$releasever/os/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+
+#released updates
+[updates]
+name=CentOS-$releasever - Updates
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=updates&infra=$infra
+#baseurl=http://mirror.centos.org/centos/$releasever/updates/$basearch/
+baseurl=http://vault.centos.org/centos/$releasever/updates/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+
+#additional packages that may be useful
+[extras]
+name=CentOS-$releasever - Extras
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=extras&infra=$infra
+#baseurl=http://mirror.centos.org/centos/$releasever/extras/$basearch/
+baseurl=http://vault.centos.org/centos/$releasever/extras/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+
+#additional packages that extend functionality of existing packages
+[centosplus]
+name=CentOS-$releasever - Plus
+#mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=centosplus&infra=$infra
+#baseurl=http://mirror.centos.org/centos/$releasever/centosplus/$basearch/
+baseurl=http://vault.centos.org/centos/$releasever/centosplus/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,5 +1,11 @@
 name: Publish
 
+# If a pull-request is pushed then cancel all previously running jobs related
+# to that pull-request
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 on:
   push:
     tags:

diff --git a/.github/workflows/review-checks.yml b/.github/workflows/review-checks.yml
@@ -1,5 +1,11 @@
 name: Review-checks
 
+# If a pull-request is pushed then cancel all previously running jobs related
+# to that pull-request
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
+
 on: [pull_request]
 
 jobs:
@@ -10,6 +16,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v1
+    - name: Setup vault.centos.org
+      run: |
+        pwd
+        ls -l ${GITHUB_WORKSPACE}/
+        ls -l ${GITHUB_WORKSPACE}/.github/
+        ls -l ${GITHUB_WORKSPACE}/.github/centos7-repo-files/
+        cp -v ${GITHUB_WORKSPACE}/.github/centos7-repo-files/* /etc/yum.repos.d/
     - name: Install utils
       run: |
         yum install -y git wget ca-certificates
@@ -52,17 +65,28 @@ jobs:
         ports:
           - 3306
     steps:
+      # Do not upgrade to @v4 as node 20 is incompatible with CentOS 7
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup vault.centos.org
+        run: |
+          pwd
+          ls -l ${GITHUB_WORKSPACE}/
+          ls -l ${GITHUB_WORKSPACE}/.github/
+          ls -l ${GITHUB_WORKSPACE}/.github/centos7-repo-files/
+          cp -v ${GITHUB_WORKSPACE}/.github/centos7-repo-files/* /etc/yum.repos.d/
       # We have to install git 2.18+ to perform checkout via git
       # This is possible only via IUS repositories
       - name: Install git to allow checkout
         run: |
           yum install https://repo.ius.io/ius-release-el7.rpm epel-release -y
           yum install git236-core -y
 
-      # Do not upgrade to @v4 as node 20 is incompatible with CentOS 7
-      - name: Checkout
-        uses: actions/checkout@v3
-
+        #      # Do not upgrade to @v4 as node 20 is incompatible with CentOS 7
+        #      - name: Checkout
+        #        uses: actions/checkout@v3
+        #
       # Remove custom git from the IUS repository - git will be reinstalled later as it is needed by beaker itself.
       - name: Remove git236 and YUM repositories
         run: yum remove git236-core ius-release epel-release -y
@@ -135,6 +159,19 @@ jobs:
             # After fixing the names of unit test functions, migrate to the latest
           - name: fedora:38
     steps:
+      # Do not upgrade to @v4 as node 20 is incompatible with CentOS 7
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup vault.centos.org
+        run: |
+          pwd
+          ls -l ${GITHUB_WORKSPACE}/
+          ls -l ${GITHUB_WORKSPACE}/.github/
+          ls -l ${GITHUB_WORKSPACE}/.github/centos7-repo-files/
+          cp -v ${GITHUB_WORKSPACE}/.github/centos7-repo-files/* /etc/yum.repos.d/
+        if: matrix.os-target.name == 'centos:7'
+
       - name: Set BKR_PY3 environment variable
         run: echo "BKR_PY3=1" >> $GITHUB_ENV
         if: matrix.os-target.name != 'centos:7'
@@ -149,10 +186,6 @@ jobs:
             dnf config-manager --set-enabled $repo
           done
 
-      # Do not upgrade to @v4 as node 20 is incompatible with CentOS 7
-      - name: Checkout
-        uses: actions/checkout@v3
-
       - name: Add Beaker Server YUM repository
         if: matrix.os-target.name == 'centos:7'
         run: |