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-930 - Remove old bintars #692

Open
wants to merge 1 commit into
base: dev
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
8 changes: 0 additions & 8 deletions constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,6 @@

SUPPORTED_PLATFORMS["10.6"] = SUPPORTED_PLATFORMS["10.5"].copy()

# Add only 10.5 supported platforms
SUPPORTED_PLATFORMS["10.5"] += [
"amd64-kvm-centos-6-bintar",
"amd64-kvm-ubuntu-1604-bintar",
"x86-kvm-centos-6-bintar",
"x86-kvm-ubuntu-1604-bintar",
]

SUPPORTED_PLATFORMS["10.6"] += [
"aarch64-ubuntu-2204",
"amd64-ubuntu-2204",
Expand Down
3 changes: 0 additions & 3 deletions docker-compose/.env
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,4 @@ NGINX_CR_HOST_WG_ADDR='100.64.100.20:8080'
ENVIRON='PROD'
BRANCH='main'
MASTER_NONLATENT_DOCKERLIBRARY_WORKER='bb-rhel8-docker'
MASTER_NONLATENT_BINTARS_WORKERS='{ "ro-apexis-bbw03-x64": { "max_builds": 2, "jobs": 12 }, "bg-bbw1-x64": { "max_builds": 1, "jobs": 12 } }'
MASTER_NONLATENT_BINTARS_VM_PORT='10000'
MASTER_NONLATENT_BINTARS_WORKER_PORT='10007'
CONTAINER_REGISTRY_URL='quay.io/mariadb-foundation/bb-worker:'
3 changes: 0 additions & 3 deletions docker-compose/.env.dev
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,4 @@ NGINX_CR_HOST_WG_ADDR='127.0.0.1:8081'
ENVIRON='DEV'
BRANCH='dev'
MASTER_NONLATENT_DOCKERLIBRARY_WORKER='bb-rhel9-docker'
MASTER_NONLATENT_BINTARS_WORKERS='{ "bg-bbw1-x64": { "max_builds": 1, "jobs": 12 } }'
MASTER_NONLATENT_BINTARS_VM_PORT='20000'
MASTER_NONLATENT_BINTARS_WORKER_PORT='10007'
CONTAINER_REGISTRY_URL='quay.io/mariadb-foundation/bb-worker:dev_'
39 changes: 0 additions & 39 deletions docker-compose/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -568,42 +568,3 @@ services:
condition: service_healthy
crossbar:
condition: service_started

master-bintars:
image: quay.io/mariadb-foundation/bb-master:dev_master
restart: unless-stopped
container_name: master-bintars
environment:
- ARTIFACTS_URL
- BRANCH
- BUILDMASTER_URL
- BUILDMASTER_WG_IP
- CONTAINER_REGISTRY_URL
- ENVIRON
- GALERA_PACKAGES_DIR
- MASTER_CREDENTIALS_DIR
- MASTER_NONLATENT_BINTARS_VM_PORT
- MASTER_NONLATENT_BINTARS_WORKERS
- MASTER_NONLATENT_BINTARS_WORKER_PORT
- MASTER_NONLATENT_DOCKERLIBRARY_WORKER
- MASTER_PACKAGES_DIR
- MC_HOST_minio=https://access_key:secret_key@minio.mariadb.org
- MQ_ROUTER_URL
- PORT=10008
- TITLE
- TITLE_URL
stop_grace_period: 5m
hostname: master-bintars
volumes:
- ./logs:/var/log/buildbot
- ./buildbot/:/srv/buildbot/master
entrypoint:
- /bin/bash
- -c
- "/srv/buildbot/master/docker-compose/start.sh master-bintars"
network_mode: host
depends_on:
mariadb:
condition: service_healthy
crossbar:
condition: service_started
1 change: 0 additions & 1 deletion docker-compose/generate-config.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"master-galera",
"master-protected-branches",
"master-docker-nonstandard-2",
"master-bintars",
]

VOLUMES = ["./logs:/var/log/buildbot", "./buildbot/:/srv/buildbot/master"]
Expand Down
39 changes: 0 additions & 39 deletions master-bintars/buildbot.tac

This file was deleted.

Loading