Remove rhel7, ubi7, and centos sentences, usage

and replace it with RHEL10.

ubi7 image is replaced with ubi10 image.

Sending analysis to logdetective. Exit code failure is
turned-off. We do not need to break tests/builds

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

README.md

@@ -84,8 +84,8 @@ Names of the directories in which the Dockerfiles are contained. Needs to be def
 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, rhel10, and fedora.
+OS version you want to build the images for. Currently, the scripts are able to build for
+c9s, c10s, rhel8, rhel9, rhel10, and fedora.
 
 `SKIP_SQUASH`
 When set to 1 the build script will skip the squash phase of the build.
@@ -122,17 +122,17 @@ how scripts in this repo work:
 
 `.exclude-<OS>`
 If this file exists, the tooling will not run the build and tests for the specific Dockerfile.
-For example, if `.exclude-rhel8` file exists, the `Dockerfile.rhel8` will not be expected
+For example, if `.exclude-rhel10` file exists, the `Dockerfile.rhel10` will not be expected
 in the same directory, build and tests will be skipped.
 Content of the file is not important at this point.
 
 `.devel-repo-<OS>`
 This file is useful if we need to work with RPMs that are not available publically yet.
 Content of the file is not important at this point.
 If such a file exists in the repository, then the building scripts will take a look
-at a correspondent variable, e.g.  DEVEL_REPO_rhel8, and will use the repository file
+at a correspondent variable, e.g.  DEVEL_REPO_rhel10, and will use the repository file
 defined by that variable.
-That means that definition of the DEVEL_REPO_rhel8 variable is a responsibility of
+That means that definition of the DEVEL_REPO_rhel10 variable is a responsibility of
 the test/CI environment.
 
 `.build-args-<OS>`

build.sh

@@ -67,7 +67,6 @@ parse_output ()
 
 analyze_logs_by_logdetective() {
   # logdetective should not break the build functionality
-  set +e
   local log_file_name="$1"
   echo "Sending failed log by fpaste command to paste bin."
   paste_bin_link=$(fpaste "$log_file_name")
@@ -87,10 +86,8 @@ analyze_logs_by_logdetective() {
     echo "ERROR: Failed to analyze log file by logdetective server."
     cat "${logdetective_build_file}"
     echo "-------- LOGDETECTIVE BUILD LOG ANALYSIS FAILED --------"
-    set -e
     return
   fi
-  set -e
   jq -rC '.explanation.text' < "${logdetective_build_file}"
   # This part of code is from https://github.com/teemtee/tmt/blob/main/tmt/steps/scripts/tmt-file-submit
   if [ -z "$TMT_TEST_PIDFILE" ]; then
@@ -247,8 +244,10 @@ function docker_build_with_version {
   else
     if [[ "${OS}" == "rhel8" ]] || [[ "${OS}" == "rhel9" ]] || [[ "${OS}" == "rhel10" ]]; then
       # Do not fail in case of sending log to pastebin or logdetective fails.
+      set +e
       echo "Analyse logs by logdetective, why it failed."
       analyze_logs_by_logdetective "${tmp_file}"
+      set -e
     fi
     exit 1
   fi

generator.py

@@ -50,12 +50,11 @@ def get_version_distro_mapping(
 
     [{"distro": "rhel-8-x86_64.yaml", "version": "3.9"},
      {"distro": "rhel-8-x86_64.yaml", "version": "3.8"},
-     {"distro": "centos-7-x86_64.yaml", "version": "3.8"},
      {"distro": "centos-stream-9-x86_64.yaml", "version": "3.9"}]
 
     and transfer them to:
 
-    {"3.8": ["rhel-8-x86_64.yaml", "centos-7-x86_64.yaml"],
+    {"3.8": ["rhel-8-x86_64.yaml", "centos-stream-10-x86_64.yaml"],
      "3.9": ["rhel-8-x86_64.yaml", "centos-stream-9-x86_64.yaml"]}
     """
     multispec_yaml = yaml.load(multispec_file.read(), Loader=yaml.SafeLoader)
@@ -74,7 +73,6 @@ def filename_to_distro_config(
     This is usually needed only for dockerfiles.
     - Dockerfile.rhelXX → rhel-XX-x86_64.yaml
     - Dockerfile.cXXs → centos-stream-XX-x86_64.yaml
-    - Dockerfile.centosX → centos-X-x86_64.yaml
     - Dockerfile.fedora → the newest fedora-XX-x86_64.yaml
 
     If not found, empty string is returned indicating that the
@@ -83,14 +81,11 @@ def filename_to_distro_config(
     """
     rhel_match = re.match(r".*\.rhel(\d+)$", filename)
     centos_stream_match = re.match(r".*\.c(\d+)s$", filename)
-    centos_match = re.match(r".*\.centos(\d+)$", filename)
 
     if rhel_match:
         config = f"rhel-{rhel_match.group(1)}-x86_64.yaml"
     elif centos_stream_match:
         config = f"centos-stream-{centos_stream_match.group(1)}-x86_64.yaml"
-    elif centos_match:
-        config = f"centos-{centos_match.group(1)}-x86_64.yaml"
     elif filename.endswith(".fedora"):
         sorted_configs = sorted(c for c in mapping[version] if c.startswith("fedora"))
         if len(sorted_configs) > 1:
@@ -103,7 +98,7 @@ def filename_to_distro_config(
             config = ""
     else:
         raise RuntimeError(
-            f"File {filename} does not match any of the known suffixes: .rhelXX, .cXs, .centosX or .fedora"
+            f"File {filename} does not match any of the known suffixes: .rhelXX, .cXs, or .fedora"
         )
 
     return config
@@ -163,10 +158,6 @@ def main() -> None:
             elif section == "SYMLINK_RULES":
                 print(f"LN\t{spec['src']} → {spec['dest']}")
                 symlink(spec["src"], spec["dest"])
-                # Remove dead symlinks
-                # This is needed for backward-compatible symlink Dockerfile → Dockerfile.centos7
-                # because we want to delete it when Dockerfile.centos7 does not exist.
-                # When we drop Centos 7, we can stop doing this.
                 # In the meantime, if you need to create a dead symlink on purpose,
                 # use check_symlink: false in manifest.yml config file.
                 # It's easier to remove dead symlinks than checking

shared-scripts/core/opt/app-root/etc/scl_enable

@@ -17,7 +17,7 @@ set -ex
 # but might be used if we need to change this behaviour.
 # Once we realize there are real use cases for using those variables, we should
 # document them properly.
-DEFAULT_REPOS=${DEFAULT_REPOS:-"rhel-7-server-rpms rhel-7-server-optional-rpms"}
+DEFAULT_REPOS=${DEFAULT_REPOS:-"rhel-10-server-baseos-rpms rhel-10-server-appstream-rpms"}
 SKIP_REPOS_ENABLE=${SKIP_REPOS_ENABLE:-false}
 SKIP_REPOS_DISABLE=${SKIP_REPOS_DISABLE:-false}
 

shared-scripts/core/usr/bin/prepare-yum-repositories

@@ -900,7 +900,7 @@ ct_os_test_response_internal() {
   local status
   local response_code
   local response_file
-  local util_image_name='registry.access.redhat.com/ubi7/ubi'
+  local util_image_name='registry.access.redhat.com/ubi10/ubi'
 
   response_file=$(mktemp /tmp/ct_test_response_XXXXXX)
   ct_os_deploy_cmd_image "${util_image_name}"