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/.github/workflows/build-centos7.pip-based.yml b/.github/workflows/build-centos7.pip-based.yml deleted file mode 100644 index 0159b5ac..00000000 --- a/.github/workflows/build-centos7.pip-based.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Build CentOS7:pip based images - -on: - push: - paths: - - 'ci_build_images/centos7.Dockerfile' - - 'ci_build_images/qpress.Dockerfile' - - 'ci_build_images/buildbot-worker.Dockerfile' - - .github/workflows/build-centos7.pip-based.yml - - .github/workflows/bbw_build_container_template.yml - pull_request: - paths: - - 'ci_build_images/centos7.Dockerfile' - - 'ci_build_images/qpress.Dockerfile' - - 'ci_build_images/buildbot-worker.Dockerfile' - - .github/workflows/build-centos7.pip-based.yml - - .github/workflows/bbw_build_container_template.yml - workflow_call: - -jobs: - build-images: - strategy: - fail-fast: false - matrix: - include: - - image: centos:7 - platforms: linux/amd64 - uses: ./.github/workflows/bbw_build_container_template.yml - with: - dockerfile: centos7.Dockerfile - image: ${{ matrix.image }} - platforms: ${{ matrix.platforms }} - secrets: inherit diff --git a/.github/workflows/build-workflow-dispatcher.yml b/.github/workflows/build-workflow-dispatcher.yml index 69a859e8..2151d887 100644 --- a/.github/workflows/build-workflow-dispatcher.yml +++ b/.github/workflows/build-workflow-dispatcher.yml @@ -3,11 +3,6 @@ name: Dispatch all build container images workflows on: workflow_dispatch: inputs: - build-centos7pip-based: - description: 'Run CentOS 7 pip-based builds' - required: true - default: false - type: boolean build-centospip-based: description: 'Run CentOS pip-based builds' required: true @@ -50,10 +45,6 @@ on: type: boolean jobs: - build-centos7pip-based: - if: ${{ inputs.build-centos7pip-based }} - uses: ./.github/workflows/build-centos7.pip-based.yml - secrets: inherit build-centospip-based: if: ${{ inputs.build-centospip-based }} uses: ./.github/workflows/build-centos.pip-based.yml diff --git a/README.md b/README.md index ccbf5636..acfd8892 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # buildbot.mariadb.org [![build-centos.pip-based](https://github.com/MariaDB/buildbot/actions/workflows/build-centos.pip-based.yml/badge.svg)](https://github.com/MariaDB/buildbot/actions/workflows/build-centos.pip-based.yml) -[![build-centos7.pip-based](https://github.com/MariaDB/buildbot/actions/workflows/build-centos7.pip-based.yml/badge.svg)](https://github.com/MariaDB/buildbot/actions/workflows/build-centos7.pip-based.yml) [![build-debian-based](https://github.com/MariaDB/buildbot/actions/workflows/build-debian-based.yml/badge.svg)](https://github.com/MariaDB/buildbot/actions/workflows/build-debian-based.yml) [![build-debian.aocc-based](https://github.com/MariaDB/buildbot/actions/workflows/build-debian.aocc-based.yml/badge.svg)](https://github.com/MariaDB/buildbot/actions/workflows/build-debian.aocc-based.yml) [![build-debian.jepsen-based](https://github.com/MariaDB/buildbot/actions/workflows/build-debian.jepsen-based.yml/badge.svg)](https://github.com/MariaDB/buildbot/actions/workflows/build-debian.jepsen-based.yml) diff --git a/ci_build_images/centos7.Dockerfile b/ci_build_images/centos7.Dockerfile deleted file mode 100644 index 9c0ec556..00000000 --- a/ci_build_images/centos7.Dockerfile +++ /dev/null @@ -1,88 +0,0 @@ -# Buildbot worker for building MariaDB -# -# Provides a base CentOS image with latest buildbot worker installed -# and MariaDB build dependencies - -ARG BASE_IMAGE -FROM "$BASE_IMAGE" -LABEL maintainer="MariaDB Buildbot maintainers" - -# Install updates and required packages -RUN sed -i -e 's/mirrorlist/#mirrorlist/g' \ - -e 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* \ - && yum -y --enablerepo=extras install epel-release \ - && sed -i -e '/baseurl/s/^#//g' \ - -e 's:download.fedoraproject.org/pub:dl.fedoraproject.org/pub/archive/:' \ - -e '/metalink/s/^/#/g' /etc/yum.repos.d/epel.repo \ - && yum -y upgrade \ - && yum -y groupinstall 'Development Tools' \ - && yum-builddep -y mariadb-server \ - && yum -y install \ - Judy-devel \ - boost-devel \ - bzip2 \ - bzip2-devel \ - ccache \ - check-devel \ - cmake3 \ - cracklib-devel \ - createrepo \ - curl-devel \ - eigen3-devel \ - galera \ - gnutls-devel \ - java-1.8.0-openjdk-devel \ - java-1.8.0-openjdk \ - jemalloc-devel \ - libcurl-devel \ - libevent-devel \ - libffi-devel \ - libxml2-devel \ - libzstd-devel \ - lz4-devel \ - pcre2-devel \ - perl-autodie \ - perl-Net-SSLeay \ - python3 \ - python3-pip \ - rpmlint \ - ruby \ - snappy-devel \ - systemd-devel \ - unixODBC \ - unixODBC-devel \ - wget \ - which \ - xz-devel \ - && yum clean all \ - && alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 \ - --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 \ - --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 \ - --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 \ - --family cmake \ - # dumb-init rpm is not available on centos - && 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 WSREP_PROVIDER=/usr/lib64/galera/libgalera_smm.so - -# pip.Dockerfile -# Imported copy as default pip on centos7 doesn't support --no-warn-script-location -# The pip upgrade would work, but that would needing a customs sles/opensuse build. -# As Centos7 is EOL, just import it and hopefully no changes. - -# Install a recent rust toolchain needed for some arch -# see: https://cryptography.io/en/latest/installation/ -# then upgrade pip and install BB worker requirements -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs >/tmp/rustup-init.sh \ - # rust installer does not detect i386 arch \ - && case $(getconf LONG_BIT) in \ - "32") bash /tmp/rustup-init.sh -y --default-host=i686-unknown-linux-gnu --profile=minimal ;; \ - *) bash /tmp/rustup-init.sh -y --profile=minimal ;; \ - esac \ - && rm -f /tmp/rustup-init.sh \ - && source "$HOME/.cargo/env" \ - && pip3 install --no-cache-dir -U pip \ - && curl -so /root/requirements.txt \ - https://raw.githubusercontent.com/MariaDB/buildbot/main/ci_build_images/requirements.txt \ - && pip3 install --no-cache-dir --no-warn-script-location -r /root/requirements.txt 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 2c4f5482..8dc194f2 100644 --- a/constants.py +++ b/constants.py @@ -24,8 +24,6 @@ # Defines what builders report status to GitHub github_status_builders = [ "aarch64-macos-compile-only", - "amd64-centos-7", - "amd64-centos-7-rpm-autobake", "amd64-debian-12", "amd64-debian-12-debug-embedded", "amd64-debian-12-deb-autobake", @@ -91,7 +89,6 @@ "aarch64-rhel-9", "aarch64-ubuntu-2004", "aarch64-ubuntu-2004-debug", - "amd64-centos-7", "amd64-centos-7-bintar", "amd64-centos-stream9", "amd64-debian-11", @@ -104,7 +101,6 @@ "amd64-fedora-40-valgrind", "amd64-freebsd-14", "amd64-openeuler-2403", - "amd64-rhel-7", "amd64-rhel-8", "amd64-rhel-9", "amd64-last-N-failed", @@ -125,7 +121,6 @@ "ppc64le-ubuntu-2004-without-server", "s390x-rhel-8", "s390x-rhel-9", - "s390x-sles-12", "s390x-ubuntu-2004", "s390x-ubuntu-2004-debug", "x86-debian-12-fulltest", 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/master-protected-branches/master.cfg b/master-protected-branches/master.cfg index 519b1fd1..00023207 100644 --- a/master-protected-branches/master.cfg +++ b/master-protected-branches/master.cfg @@ -179,14 +179,6 @@ def addWorker( for w_name in ["hz-bbw"]: jobs = 7 for i in [1, 4]: - addWorker( - w_name, - i, - "-centos-7", - os.getenv("CONTAINER_REGISTRY_URL", default="quay.io/mariadb-foundation/bb-worker:") + "centos7", - jobs=jobs, - save_packages=True, - ) addWorker( w_name, i, @@ -575,20 +567,6 @@ c["builders"].append( ) ) -c["builders"].append( - util.BuilderConfig( - name="amd64-centos-7", - workernames=workers["x64-bbw-docker-centos-7"], - tags=["Centos", "quick", "gcc", "protected"], - collapseRequests=True, - nextBuild=nextBuild, - canStartBuild=canStartBuild, - locks=getLocks, - properties={"mtr_additional_args": protected_branches_mtr_additional_args}, - factory=getQuickBuildFactory("nm", mtrDbPool), - ) -) - c["logEncoding"] = "utf-8" c["multiMaster"] = True diff --git a/master.cfg b/master.cfg index 6337e48b..a33fbd82 100644 --- a/master.cfg +++ b/master.cfg @@ -334,7 +334,6 @@ for builder in master_config["builders"]: "amd64-openeuler-2403", "s390x-ubuntu-2004", "s390x-rhel-8", - "s390x-sles-12", "s390x-sles-15", "ppc64le-rhel-9", "s390x-rhel-9", diff --git a/os_info.yaml b/os_info.yaml index 2de78f57..48d12a83 100644 --- a/os_info.yaml +++ b/os_info.yaml @@ -13,11 +13,6 @@ almalinux-9: - aarch64 type: rpm install_only: True -centos-7: - version_name: 7 - arch: - - amd64 - type: rpm centos-stream9: version_name: 9 arch: @@ -81,11 +76,6 @@ opensuse-1506: arch: - amd64 type: rpm -rhel-7: - version_name: 7 - arch: - - amd64 - type: rpm rhel-8: version_name: 8 arch: @@ -114,11 +104,6 @@ rockylinux-9: - amd64 type: rpm install_only: True -sles-12: - version_name: 12 - arch: - - s390x - type: rpm sles-1505: version_name: 15.5 arch: diff --git a/scripts/rpm-upgrade.sh b/scripts/rpm-upgrade.sh index 844e8f1f..991f1ad7 100755 --- a/scripts/rpm-upgrade.sh +++ b/scripts/rpm-upgrade.sh @@ -20,10 +20,6 @@ upgrade_test_type "$test_type" package_version=${mariadb_version/mariadb-/} distro=$version_name -if [[ $distro == "sles123" ]]; then - distro="sles12" -fi - bb_print_env # This test can be performed in four modes: