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

MDBF-781 - EOL Builders October - remove from BB #606

Merged
merged 3 commits into from
Nov 12, 2024
Merged
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
6 changes: 0 additions & 6 deletions .github/workflows/bbw_build_container_rhel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,13 @@ 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'
- .github/workflows/bbw_build_container_rhel.yml
- 'ci_build_images/pip.Dockerfile'
- 'ci_build_images/qpress.Dockerfile'
- 'ci_build_images/rhel.Dockerfile'
- 'ci_build_images/rhel7.Dockerfile'
workflow_dispatch:

jobs:
Expand All @@ -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
Expand Down
33 changes: 0 additions & 33 deletions .github/workflows/build-centos7.pip-based.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .github/workflows/build-workflow-dispatcher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
88 changes: 0 additions & 88 deletions ci_build_images/centos7.Dockerfile

This file was deleted.

68 changes: 0 additions & 68 deletions ci_build_images/rhel7.Dockerfile

This file was deleted.

5 changes: 0 additions & 5 deletions constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
3 changes: 0 additions & 3 deletions locks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions master-private.cfg-sample
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ private["master-variables"] = {
],
"ppc64le": [
'ppc64le-rhel8-bbw1',
'ppc64le-rhel7-bbw1',
'ppc64le-db-bbw1',
'ppc64le-raptor-bbw1',
],
Expand Down Expand Up @@ -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",
Expand Down
22 changes: 0 additions & 22 deletions master-protected-branches/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
15 changes: 0 additions & 15 deletions os_info.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
Loading