Skip to content
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.

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

Support for building and testing RHEL10 #384

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Dockerfile for the scripts to know which versions to build.

`OS`
OS version you want to build the images for. Currently the scripts are able to build for
centos (default), c9s, c10s, rhel8, rhel9, and fedora.
centos (default), c9s, c10s, rhel8, rhel9, rhel10, and fedora.

`SKIP_SQUASH`
When set to 1 the build script will skip the squash phase of the build.
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# This script is used to build the OpenShift Docker images.
#
# OS - Specifies distribution - "rhel8", "rhel9", "c9s", "c10s" or "fedora"
# OS - Specifies distribution - "rhel8", "rhel9", "rhel10", "c9s", "c10s" or "fedora"
# VERSION - Specifies the image version - (must match with subdirectory in repo)
# SINGLE_VERSION - Specifies the image version - (must match with subdirectory in repo)
# VERSIONS - Must be set to a list with possible versions (subdirectories)
Expand Down
3 changes: 3 additions & 0 deletions common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ ifeq ($(TARGET),rhel8)
else ifeq ($(TARGET),rhel9)
OS := rhel9
DOCKERFILE ?= Dockerfile.rhel9
else ifeq ($(TARGET),rhel10)
OS := rhel10
DOCKERFILE ?= Dockerfile.rhel10
else ifeq ($(TARGET),fedora)
OS := fedora
DOCKERFILE ?= Dockerfile.fedora
Expand Down
2 changes: 2 additions & 0 deletions test-lib-remote-openshift.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ function ct_os_tag_image_for_cvp() {
tag="-el8"
elif [ "${OS}" == "rhel9" ]; then
tag="-el9"
elif [ "${OS}" == "rhel10" ]; then
tag="-el10"
else
echo "Only RHEL images are supported."
return
Expand Down
2 changes: 2 additions & 0 deletions test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,8 @@ ct_get_public_image_name() {
public_image_name=$registry/rhel8/$base_image_name-${version//./}
elif [ "$os" == "rhel9" ]; then
public_image_name=$registry/rhel9/$base_image_name-${version//./}
elif [ "$os" == "rhel10" ]; then
public_image_name=$registry/rhel10/$base_image_name-${version//./}
elif [ "$os" == "c9s" ]; then
public_image_name=$registry/sclorg/$base_image_name-${version//./}-c9s
elif [ "$os" == "c10s" ]; then
Expand Down
3 changes: 3 additions & 0 deletions tests/failures/check/v0/Dockerfile.rhel10
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM ubi9/s2i-core
## ubi10/s2i-core does not exist let's use ubi9/s2i-core
LABEL name=test-image
Loading