diff --git a/.github/workflows/bbw_build_container_rhel.yml b/.github/workflows/bbw_build_container_rhel.yml index 72fdfbd5..8657b189 100644 --- a/.github/workflows/bbw_build_container_rhel.yml +++ b/.github/workflows/bbw_build_container_rhel.yml @@ -9,7 +9,6 @@ on: - 'ci_build_images/pip.Dockerfile' - 'ci_build_images/qpress.Dockerfile' - 'ci_build_images/rhel.Dockerfile' - - 'ci_build_images/rhel7.Dockerfile' pull_request: paths: - 'ci_build_images/buildbot-worker.Dockerfile' @@ -17,7 +16,6 @@ on: - 'ci_build_images/pip.Dockerfile' - 'ci_build_images/qpress.Dockerfile' - 'ci_build_images/rhel.Dockerfile' - - 'ci_build_images/rhel7.Dockerfile' workflow_dispatch: jobs: @@ -33,10 +31,6 @@ jobs: fail-fast: false matrix: include: - - dockerfile: rhel7.Dockerfile pip.Dockerfile - image: rhel7 - platforms: linux/amd64 - nogalera: false - dockerfile: rhel.Dockerfile image: ubi8 tag: rhel8 diff --git a/ci_build_images/rhel7.Dockerfile b/ci_build_images/rhel7.Dockerfile deleted file mode 100644 index cdf676f1..00000000 --- a/ci_build_images/rhel7.Dockerfile +++ /dev/null @@ -1,68 +0,0 @@ -# Buildbot worker for building MariaDB -# -# Provides a base RHEL-7 image with latest buildbot worker installed -# and MariaDB build dependencies - -ARG BASE_IMAGE -FROM registry.access.redhat.com/$BASE_IMAGE -LABEL maintainer="MariaDB Buildbot maintainers" - -# Install updates and required packages -RUN --mount=type=secret,id=rhel_orgid,target=/run/secrets/rhel_orgid \ - --mount=type=secret,id=rhel_keyname,target=/run/secrets/rhel_keyname \ - sed -i 's/\(def in_container():\)/\1\n return False/g' /usr/lib64/python*/*-packages/rhsm/config.py \ - && subscription-manager register \ - --org="$(cat /run/secrets/rhel_orgid)" \ - --activationkey="$(cat /run/secrets/rhel_keyname)" \ - && rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ - && yum -y upgrade \ - # the following is needed in case the subscription-manager was upgraded by the previous step \ - && sed -i 's/\(def in_container():\)/\1\n return False/g' /usr/lib64/python*/*-packages/rhsm/config.py \ - && subscription-manager unregister \ - && subscription-manager clean \ - && subscription-manager register \ - --org="$(cat /run/secrets/rhel_orgid)" \ - --activationkey="$(cat /run/secrets/rhel_keyname)" \ - && subscription-manager repos --enable=rhel-7-server-optional-rpms \ - && yum-builddep -y mariadb-server \ - && yum -y install \ - @development \ - boost-devel \ - bzip2 \ - bzip2-devel \ - ccache \ - check-devel \ - cmake3 \ - cracklib-devel \ - createrepo \ - curl-devel \ - galera \ - java-latest-openjdk-devel \ - java-latest-openjdk \ - jemalloc-devel \ - libffi-devel \ - libxml2-devel \ - lz4-devel \ - perl-autodie \ - perl-Net-SSLeay \ - pcre2-devel \ - python3-pip \ - rpmlint \ - snappy-devel \ - systemd-devel \ - wget \ - && if [ "$(arch)" = "ppc64le" ]; then \ - subscription-manager repos --enable rhel-7-for-power-le-optional-rpms; \ - yum -y install python3-devel; \ - fi \ - && yum clean all \ - && subscription-manager unregister \ - # We can't use old cmake version (from @development package) \ - && yum -y remove cmake \ - && ln -sf /usr/bin/cmake3 /usr/bin/cmake \ - && curl -sL "https://github.com/Yelp/dumb-init/releases/download/v1.2.5/dumb-init_1.2.5_$(uname -m)" >/usr/local/bin/dumb-init \ - && chmod +x /usr/local/bin/dumb-init - -ENV CRYPTOGRAPHY_ALLOW_OPENSSL_102=1 - -ENV WSREP_PROVIDER=/usr/lib64/galera/libgalera_smm.so diff --git a/constants.py b/constants.py index 1bba60d3..bbde97b8 100644 --- a/constants.py +++ b/constants.py @@ -104,7 +104,6 @@ "amd64-fedora-40-valgrind", "amd64-freebsd-14", "amd64-openeuler-2403", - "amd64-rhel-7", "amd64-rhel-8", "amd64-rhel-9", "amd64-last-N-failed", diff --git a/locks.py b/locks.py index 61360b9f..c80239c8 100644 --- a/locks.py +++ b/locks.py @@ -19,7 +19,6 @@ amd_bbw2_lock = util.MasterLock("amd_bbw2_lock", maxCount=6) intel_bbw1_lock = util.MasterLock("intel_bbw1_lock", maxCount=5) p9_rhel8_bbw1_lock = util.MasterLock("p9_rhel8_bbw1_lock", maxCount=6) -p9_rhel7_bbw1_lock = util.MasterLock("p9_rhel7_bbw1_lock", maxCount=6) p9_db_bbw1_lock = util.MasterLock("p9_db_bbw1_lock", maxCount=8) p9_raptor_bbw1_lock = util.MasterLock("p9_raptor_bbw1_lock", maxCount=6) aarch_bbw1_lock = util.MasterLock("aarch64_bbw1_lock", maxCount=2) @@ -74,8 +73,6 @@ def getLocks(props): locks = locks + [intel_bbw1_lock.access("counting")] if "ppc64le-rhel8-bbw1-docker" in worker_name: locks = locks + [p9_rhel8_bbw1_lock.access("counting")] - if "ppc64le-rhel7-bbw1-docker" in worker_name: - locks = locks + [p9_rhel7_bbw1_lock.access("counting")] if "ppc64le-db-bbw1-docker" in worker_name: locks = locks + [p9_db_bbw1_lock.access("counting")] if "ppc64le-raptor-bbw1-docker" in worker_name: diff --git a/master-private.cfg-sample b/master-private.cfg-sample index 0c220027..02db88f9 100644 --- a/master-private.cfg-sample +++ b/master-private.cfg-sample @@ -26,7 +26,6 @@ private["master-variables"] = { ], "ppc64le": [ 'ppc64le-rhel8-bbw1', - 'ppc64le-rhel7-bbw1', 'ppc64le-db-bbw1', 'ppc64le-raptor-bbw1', ], @@ -69,7 +68,6 @@ private["docker_workers"]= { "gsk-bbw1-docker":"tcp://IP_address:port", "bm-bbw1-docker":"tcp://IP_address:port", "ppc64le-rhel8-bbw1-docker":"tcp://IP_address:port", - "ppc64le-rhel7-bbw1-docker":"tcp://IP_address:port", "ppc64le-db-bbw1-docker":"tcp://IP_address:port", "ppc64le-raptor-bbw1-docker":"tcp://IP_address:port", "aarch64-bbw1-docker":"tcp://IP_address:port", diff --git a/os_info.yaml b/os_info.yaml index ecaa29e5..068b9d8e 100644 --- a/os_info.yaml +++ b/os_info.yaml @@ -81,11 +81,6 @@ opensuse-1506: arch: - amd64 type: rpm -rhel-7: - version_name: 7 - arch: - - amd64 - type: rpm rhel-8: version_name: 8 arch: