Skip to content

Commit 008bdda

Browse files
robinnewhouseLinuxJedi
authored andcommitted
GitLab CI Upgrade CentOS 8 to CentOS 9 build
> After May 31, 2024, CentOS Stream 8 will be archived and no further updates will be provided. [1] CentOS Stream 8 is now EOL and should be updated to using CentOS Stream 9 for compatibility testing in GitLab CI. [1] https://blog.centos.org/2023/04/end-dates-are-coming-for-centos-stream-8-and-centos-linux-7/ https://www.centos.org/centos-linux-eol/ All new code of the whole pull request, including one or several files that are either new files or modified ones, are contributed under the BSD-new license. I am contributing on behalf of my employer Amazon Web Services.
1 parent e7c2e25 commit 008bdda

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed

.gitlab-ci.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ variables:
4444
# Major version dictates which branches share the same ccache. E.g. 10.6-abc
4545
# and 10.6-xyz will have the same cache.
4646
MARIADB_MAJOR_VERSION: "10.5"
47-
# NOTE! Currently ccache is only used on the Centos8 build. As each job has
47+
# NOTE! Currently ccache is only used on the Centos 9 build. As each job has
4848
# sufficiently different environments they are unable to benefit from each
4949
# other's ccaches. As each build generates about 1 GB of ccache, having
5050
# multiple caches would quickly consume all free storage on Gitlab-CI and
@@ -53,7 +53,7 @@ variables:
5353
# cache:policy are not flexible enough to have a system where the cache is
5454
# uploaded only once a week and not on every build. Having ccache on at least
5555
# one build still helps ensure that ccache compatibility is at least tested
56-
# and if the Centos 8 build is always significantly faster than all other
56+
# and if the Centos 9 build is always significantly faster than all other
5757
# builds (e.g. on self-hosted Gitlab instances) then users would at least be
5858
# able to discover it.
5959
#
@@ -209,26 +209,20 @@ fedora-sanitizer:
209209
matrix:
210210
- SANITIZER: [-DWITH_ASAN=YES, -DWITH_TSAN=YES, -DWITH_UBSAN=YES]
211211

212-
centos8:
212+
centos9:
213213
stage: build
214-
image: quay.io/centos/centos:stream8 # CentOS 8 is deprecated, use this Stream8 instead
214+
image: quay.io/centos/centos:stream9 # CentOS 9 is deprecated, use this Stream9 instead
215215
variables:
216216
GIT_STRATEGY: fetch
217217
GIT_SUBMODULE_STRATEGY: normal
218218
script:
219-
- yum install -y yum-utils rpm-build openssl-devel pcre2-devel
220-
- yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
221-
# dnf --enablerepo=powertools install Judy-devel #--> not found
222-
- dnf config-manager --set-enabled powertools
223-
# Error:
224-
# Problem: conflicting requests
225-
# - package Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.i686 is filtered out by modular filtering
226-
# - package Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64 is filtered out by modular filtering
227-
# Solution: install Judy-devel directly from downloaded rpm file:
228-
- yum install -y http://vault.centos.org/centos/8/PowerTools/x86_64/os/Packages/Judy-devel-1.0.5-18.module_el8.3.0+757+d382997d.x86_64.rpm
229-
# Use eatmydata to speed up build
230-
- yum install -y https://github.com/stewartsmith/libeatmydata/releases/download/v129/libeatmydata-129-1.fc33.x86_64.rpm
231-
- yum install -y ccache # From EPEL
219+
- yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
220+
- yum install -y yum-utils rpm-build openssl-devel libeatmydata ccache
221+
# Install missing dependencies
222+
- yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/Judy-devel-1.0.5-28.el9.x86_64.rpm
223+
- yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/bison-devel-3.7.4-5.el9.x86_64.rpm
224+
- yum install -y https://mirror.stream.centos.org/9-stream/CRB/x86_64/os/Packages/multilib-rpm-config-1-19.el9.noarch.rpm
225+
# Configure ccache
232226
- source /etc/profile.d/ccache.sh
233227
- export CCACHE_DIR="$(pwd)/.ccache"; ccache --zero-stats
234228
# This repository does not have any .spec files, so install dependencies based on CentOS spec file

0 commit comments

Comments
 (0)