Skip to content

switch to rocky8 #946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

switch to rocky8 #946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ workflows:
parameters:
osnick:
- bionic
- centos8
- rocky8
lite:
- "REDISAI_LITE=0 PUBLISH=1"
- "REDISAI_LITE=1"
Expand All @@ -623,7 +623,7 @@ workflows:
parameters:
osnick:
- bionic
- centos8
- rocky8
lite:
- "REDISAI_LITE=0 PUBLISH=1"
- "REDISAI_LITE=1"
Expand Down
4 changes: 2 additions & 2 deletions opt/build/docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ endif
ifeq ($(OSNICK),bionic)
REDIS_CUDA_MAPVERSION=ubuntu18.04
endif
ifeq ($(OSNICK),centos8)
REDIS_CUDA_MAPVERSION=centos8
ifeq ($(OSNICK),rocky8)
REDIS_CUDA_MAPVERSION=rocky8
endif

DOCKERWRAPPER_EXTRA_VARS=\
Expand Down
8 changes: 4 additions & 4 deletions opt/build/docker/dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ RUN echo "Building for {{REDIS_OSNICK}} ({{REDIS_OS}}) for {{REDIS_ARCH}} [with
{% include "templates/gpu.yml" %}
{% endif %}

# centos8 specific integration until a move to rocky or similar
{% if REDIS_OSNICK == "centos8" %}
# rocky8 specific integration until a move to rocky or similar
{% if REDIS_OSNICK == "rocky8" %}
RUN cd /etc/yum.repos.d/
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
Expand Down Expand Up @@ -75,8 +75,8 @@ FROM redisfab/redis:{{REDIS_VERSION}}-{{REDIS_ARCH}}-{{REDIS_OSNICK}}
{% endif %}

ARG PACK
# centos8 specific integration until a move to rocky or similar
{% if REDIS_OSNICK == "centos8" %}
# rocky8 specific integration until a move to rocky or similar
{% if REDIS_OSNICK == "rocky8" %}
RUN cd /etc/yum.repos.d/
RUN sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
RUN sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
Expand Down
2 changes: 1 addition & 1 deletion opt/readies
Open in desktop
Submodule readies updated 107 files
4 changes: 2 additions & 2 deletions opt/system-setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def common_first(self):
self.pip_install("wheel")

self.install("git unzip")
if self.osnick != 'centos8':
if self.osnick != 'rocky8':
self.install("coreutils") # for realpath

def debian_compat(self):
Expand All @@ -35,7 +35,7 @@ def debian_compat(self):
def redhat_compat(self):
self.run("%s/bin/enable-utf8" % READIES)
self.install("epel-release")
if self.osnick == "centos8":
if self.osnick == "rocky8":
self.run("dnf install -qy dnf-plugins-core")
self.run("dnf config-manager -qy --set-enabled powertools")
self.install("redhat-lsb-core")
Expand Down