Skip to content

Commit 5eba02a

Browse files
renecannaorenecannao
authored
Merge pull request #79 from ProxySQL/feature/tarball-registry-mariadb-percona
fix: resolve CI failures for MariaDB, Percona, ts tests, fan-in
2 parents aacbc3f + 187a08f commit 5eba02a

5 files changed

Lines changed: 83 additions & 198 deletions

File tree

‎.github/workflows/integration_tests.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,16 +122,16 @@ jobs:
122122
run: |
123123
# Extract major.minor from version (e.g., "8.0.36-28" -> "8.0")
124124
MAJOR_MINOR=$(echo "$PERCONA_VERSION" | grep -oP '^\d+\.\d+')
125-
GLIBC="glibc2.17"
125+
GLIBC="glibc2.35"
126126
TARBALL="Percona-Server-${PERCONA_VERSION}-Linux.x86_64.${GLIBC}-minimal.tar.gz"
127127
URL="https://downloads.percona.com/downloads/Percona-Server-${MAJOR_MINOR}/Percona-Server-${PERCONA_VERSION}/binary/tarball/${TARBALL}"
128-
echo "Downloading Percona Server ${PERCONA_VERSION}..."
128+
echo "Downloading Percona Server ${PERCONA_VERSION} (${GLIBC})..."
129129
mkdir -p "$SANDBOX_BINARY"
130130
curl -L -f -o "/tmp/$TARBALL" "$URL" || {
131-
GLIBC="glibc2.35"
131+
GLIBC="glibc2.17"
132132
TARBALL="Percona-Server-${PERCONA_VERSION}-Linux.x86_64.${GLIBC}-minimal.tar.gz"
133133
URL="https://downloads.percona.com/downloads/Percona-Server-${MAJOR_MINOR}/Percona-Server-${PERCONA_VERSION}/binary/tarball/${TARBALL}"
134-
echo "Retrying with glibc2.35..."
134+
echo "Retrying with glibc2.17..."
135135
curl -L -f -o "/tmp/$TARBALL" "$URL"
136136
}
137137
./dbdeployer unpack "/tmp/$TARBALL" --sandbox-binary="$SANDBOX_BINARY"
@@ -169,8 +169,8 @@ jobs:
169169
fail-fast: false
170170
matrix:
171171
mariadb-version:
172-
- '10.11.25'
173-
- '11.4.10'
172+
- '10.11.9'
173+
- '11.4.5'
174174
env:
175175
GO111MODULE: on
176176
SANDBOX_BINARY: ${{ github.workspace }}/opt/mysql
@@ -192,8 +192,8 @@ jobs:
192192

193193
- name: Download and unpack MariaDB
194194
run: |
195-
TARBALL="mariadb-${MARIADB_VERSION}-linux-x86_64.tar.gz"
196-
URL="https://downloads.mariadb.com/MariaDB/mariadb-${MARIADB_VERSION}/bintar-linux-x86_64/${TARBALL}"
195+
TARBALL="mariadb-${MARIADB_VERSION}-linux-systemd-x86_64.tar.gz"
196+
URL="https://archive.mariadb.org/mariadb-${MARIADB_VERSION}/bintar-linux-systemd-x86_64/${TARBALL}"
197197
echo "Downloading MariaDB ${MARIADB_VERSION}..."
198198
mkdir -p "$SANDBOX_BINARY"
199199
curl -L -f -o "/tmp/$TARBALL" "$URL"
@@ -253,7 +253,7 @@ jobs:
253253
- name: Download MySQL versions
254254
run: |
255255
mkdir -p "$SANDBOX_BINARY"
256-
for VER in 5.7.44 8.0.42 8.4.8 9.5.0; do
256+
for VER in 8.0.42 8.4.8 9.5.0; do
257257
SHORT="${VER%.*}"
258258
TARBALL="mysql-${VER}-linux-glibc2.17-x86_64-minimal.tar.xz"
259259
echo "Downloading $VER..."
@@ -269,7 +269,7 @@ jobs:
269269
270270
- name: Run ts replication tests (MySQL)
271271
env:
272-
TEST_SHORT_VERSIONS: "5.7,8.0,8.4,9.5"
272+
TEST_SHORT_VERSIONS: "8.0,8.4,9.5"
273273
run: |
274274
export HOME="$GITHUB_WORKSPACE/home"
275275
mkdir -p "$HOME/sandboxes" "$HOME/.dbdeployer"
@@ -403,6 +403,8 @@ jobs:
403403
PG_FULL=$(ls ~/opt/postgresql/ | head -1)
404404
echo "=== Deploying PostgreSQL $PG_FULL multiple (3 nodes) ==="
405405
./dbdeployer deploy multiple "$PG_FULL" --provider=postgresql --nodes=3
406+
echo "=== Waiting for nodes to start ==="
407+
sleep 5
406408
echo "=== Checking topology dir ==="
407409
ls ~/sandboxes/multi_msb_*/
408410
echo "=== Connect to node1 ==="

‎downloads/tarball_list.json‎

Lines changed: 65 additions & 182 deletions
Original file line numberDiff line numberDiff line change
@@ -3121,188 +3121,6 @@
31213121
"notes": "added with version 2.0.0",
31223122
"date_added": "2026-03-24 00:00"
31233123
},
3124-
{
3125-
"name": "mariadb-10.6.25-linux-x86_64.tar.gz",
3126-
"OS": "Linux",
3127-
"arch": "amd64",
3128-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-10.6.25/bintar-linux-x86_64/mariadb-10.6.25-linux-x86_64.tar.gz",
3129-
"flavor": "mariadb",
3130-
"minimal": false,
3131-
"size": 0,
3132-
"short_version": "10.6",
3133-
"version": "10.6.25",
3134-
"notes": "added with version 2.1.1",
3135-
"date_added": "2026-04-05 00:00"
3136-
},
3137-
{
3138-
"name": "mariadb-10.6.25-linux-aarch64.tar.gz",
3139-
"OS": "Linux",
3140-
"arch": "arm64",
3141-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-10.6.25/bintar-linux-aarch64/mariadb-10.6.25-linux-aarch64.tar.gz",
3142-
"flavor": "mariadb",
3143-
"minimal": false,
3144-
"size": 0,
3145-
"short_version": "10.6",
3146-
"version": "10.6.25",
3147-
"notes": "added with version 2.1.1",
3148-
"date_added": "2026-04-05 00:00"
3149-
},
3150-
{
3151-
"name": "mariadb-10.11.25-linux-x86_64.tar.gz",
3152-
"OS": "Linux",
3153-
"arch": "amd64",
3154-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-10.11.25/bintar-linux-x86_64/mariadb-10.11.25-linux-x86_64.tar.gz",
3155-
"flavor": "mariadb",
3156-
"minimal": false,
3157-
"size": 0,
3158-
"short_version": "10.11",
3159-
"version": "10.11.25",
3160-
"notes": "added with version 2.1.1",
3161-
"date_added": "2026-04-05 00:00"
3162-
},
3163-
{
3164-
"name": "mariadb-10.11.25-linux-aarch64.tar.gz",
3165-
"OS": "Linux",
3166-
"arch": "arm64",
3167-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-10.11.25/bintar-linux-aarch64/mariadb-10.11.25-linux-aarch64.tar.gz",
3168-
"flavor": "mariadb",
3169-
"minimal": false,
3170-
"size": 0,
3171-
"short_version": "10.11",
3172-
"version": "10.11.25",
3173-
"notes": "added with version 2.1.1",
3174-
"date_added": "2026-04-05 00:00"
3175-
},
3176-
{
3177-
"name": "mariadb-11.0.10-linux-x86_64.tar.gz",
3178-
"OS": "Linux",
3179-
"arch": "amd64",
3180-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-11.0.10/bintar-linux-x86_64/mariadb-11.0.10-linux-x86_64.tar.gz",
3181-
"flavor": "mariadb",
3182-
"minimal": false,
3183-
"size": 0,
3184-
"short_version": "11.0",
3185-
"version": "11.0.10",
3186-
"notes": "added with version 2.1.1",
3187-
"date_added": "2026-04-05 00:00"
3188-
},
3189-
{
3190-
"name": "mariadb-11.1.10-linux-x86_64.tar.gz",
3191-
"OS": "Linux",
3192-
"arch": "amd64",
3193-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-11.1.10/bintar-linux-x86_64/mariadb-11.1.10-linux-x86_64.tar.gz",
3194-
"flavor": "mariadb",
3195-
"minimal": false,
3196-
"size": 0,
3197-
"short_version": "11.1",
3198-
"version": "11.1.10",
3199-
"notes": "added with version 2.1.1",
3200-
"date_added": "2026-04-05 00:00"
3201-
},
3202-
{
3203-
"name": "mariadb-11.2.10-linux-x86_64.tar.gz",
3204-
"OS": "Linux",
3205-
"arch": "amd64",
3206-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-11.2.10/bintar-linux-x86_64/mariadb-11.2.10-linux-x86_64.tar.gz",
3207-
"flavor": "mariadb",
3208-
"minimal": false,
3209-
"size": 0,
3210-
"short_version": "11.2",
3211-
"version": "11.2.10",
3212-
"notes": "added with version 2.1.1",
3213-
"date_added": "2026-04-05 00:00"
3214-
},
3215-
{
3216-
"name": "mariadb-11.3.10-linux-x86_64.tar.gz",
3217-
"OS": "Linux",
3218-
"arch": "amd64",
3219-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-11.3.10/bintar-linux-x86_64/mariadb-11.3.10-linux-x86_64.tar.gz",
3220-
"flavor": "mariadb",
3221-
"minimal": false,
3222-
"size": 0,
3223-
"short_version": "11.3",
3224-
"version": "11.3.10",
3225-
"notes": "added with version 2.1.1",
3226-
"date_added": "2026-04-05 00:00"
3227-
},
3228-
{
3229-
"name": "mariadb-11.4.10-linux-x86_64.tar.gz",
3230-
"OS": "Linux",
3231-
"arch": "amd64",
3232-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-11.4.10/bintar-linux-x86_64/mariadb-11.4.10-linux-x86_64.tar.gz",
3233-
"flavor": "mariadb",
3234-
"minimal": false,
3235-
"size": 0,
3236-
"short_version": "11.4",
3237-
"version": "11.4.10",
3238-
"notes": "added with version 2.1.1",
3239-
"date_added": "2026-04-05 00:00"
3240-
},
3241-
{
3242-
"name": "mariadb-11.4.10-linux-aarch64.tar.gz",
3243-
"OS": "Linux",
3244-
"arch": "arm64",
3245-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-11.4.10/bintar-linux-aarch64/mariadb-11.4.10-linux-aarch64.tar.gz",
3246-
"flavor": "mariadb",
3247-
"minimal": false,
3248-
"size": 0,
3249-
"short_version": "11.4",
3250-
"version": "11.4.10",
3251-
"notes": "added with version 2.1.1",
3252-
"date_added": "2026-04-05 00:00"
3253-
},
3254-
{
3255-
"name": "mariadb-11.5.10-linux-x86_64.tar.gz",
3256-
"OS": "Linux",
3257-
"arch": "amd64",
3258-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-11.5.10/bintar-linux-x86_64/mariadb-11.5.10-linux-x86_64.tar.gz",
3259-
"flavor": "mariadb",
3260-
"minimal": false,
3261-
"size": 0,
3262-
"short_version": "11.5",
3263-
"version": "11.5.10",
3264-
"notes": "added with version 2.1.1",
3265-
"date_added": "2026-04-05 00:00"
3266-
},
3267-
{
3268-
"name": "mariadb-11.6.10-linux-x86_64.tar.gz",
3269-
"OS": "Linux",
3270-
"arch": "amd64",
3271-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-11.6.10/bintar-linux-x86_64/mariadb-11.6.10-linux-x86_64.tar.gz",
3272-
"flavor": "mariadb",
3273-
"minimal": false,
3274-
"size": 0,
3275-
"short_version": "11.6",
3276-
"version": "11.6.10",
3277-
"notes": "added with version 2.1.1",
3278-
"date_added": "2026-04-05 00:00"
3279-
},
3280-
{
3281-
"name": "mariadb-11.7.10-linux-x86_64.tar.gz",
3282-
"OS": "Linux",
3283-
"arch": "amd64",
3284-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-11.7.10/bintar-linux-x86_64/mariadb-11.7.10-linux-x86_64.tar.gz",
3285-
"flavor": "mariadb",
3286-
"minimal": false,
3287-
"size": 0,
3288-
"short_version": "11.7",
3289-
"version": "11.7.10",
3290-
"notes": "added with version 2.1.1",
3291-
"date_added": "2026-04-05 00:00"
3292-
},
3293-
{
3294-
"name": "mariadb-11.8.10-linux-x86_64.tar.gz",
3295-
"OS": "Linux",
3296-
"arch": "amd64",
3297-
"url": "https://downloads.mariadb.com/MariaDB/mariadb-11.8.10/bintar-linux-x86_64/mariadb-11.8.10-linux-x86_64.tar.gz",
3298-
"flavor": "mariadb",
3299-
"minimal": false,
3300-
"size": 0,
3301-
"short_version": "11.8",
3302-
"version": "11.8.10",
3303-
"notes": "added with version 2.1.1",
3304-
"date_added": "2026-04-05 00:00"
3305-
},
33063124
{
33073125
"name": "Percona-Server-5.7.41-44-Linux.x86_64.glibc2.17-minimal.tar.gz",
33083126
"OS": "Linux",
@@ -3484,6 +3302,71 @@
34843302
"version": "8.4.4",
34853303
"notes": "added with version 2.1.1",
34863304
"date_added": "2026-04-05 00:00"
3305+
},
3306+
{
3307+
"name": "mariadb-10.6.9-linux-systemd-x86_64.tar.gz",
3308+
"OS": "Linux",
3309+
"arch": "amd64",
3310+
"url": "https://archive.mariadb.org/mariadb-10.6.9/bintar-linux-systemd-x86_64/mariadb-10.6.9-linux-systemd-x86_64.tar.gz",
3311+
"flavor": "mariadb",
3312+
"minimal": false,
3313+
"size": 0,
3314+
"short_version": "10.6",
3315+
"version": "10.6.9",
3316+
"notes": "archive.mariadb.org LTS",
3317+
"date_added": "2026-04-02 00:00"
3318+
},
3319+
{
3320+
"name": "mariadb-10.11.9-linux-systemd-x86_64.tar.gz",
3321+
"OS": "Linux",
3322+
"arch": "amd64",
3323+
"url": "https://archive.mariadb.org/mariadb-10.11.9/bintar-linux-systemd-x86_64/mariadb-10.11.9-linux-systemd-x86_64.tar.gz",
3324+
"flavor": "mariadb",
3325+
"minimal": false,
3326+
"size": 0,
3327+
"short_version": "10.11",
3328+
"version": "10.11.9",
3329+
"notes": "archive.mariadb.org LTS",
3330+
"date_added": "2026-04-02 00:00"
3331+
},
3332+
{
3333+
"name": "mariadb-11.4.5-linux-systemd-x86_64.tar.gz",
3334+
"OS": "Linux",
3335+
"arch": "amd64",
3336+
"url": "https://archive.mariadb.org/mariadb-11.4.5/bintar-linux-systemd-x86_64/mariadb-11.4.5-linux-systemd-x86_64.tar.gz",
3337+
"flavor": "mariadb",
3338+
"minimal": false,
3339+
"size": 0,
3340+
"short_version": "11.4",
3341+
"version": "11.4.5",
3342+
"notes": "archive.mariadb.org LTS",
3343+
"date_added": "2026-04-02 00:00"
3344+
},
3345+
{
3346+
"name": "mariadb-11.4.9-linux-systemd-x86_64.tar.gz",
3347+
"OS": "Linux",
3348+
"arch": "amd64",
3349+
"url": "https://archive.mariadb.org/mariadb-11.4.9/bintar-linux-systemd-x86_64/mariadb-11.4.9-linux-systemd-x86_64.tar.gz",
3350+
"flavor": "mariadb",
3351+
"minimal": false,
3352+
"size": 0,
3353+
"short_version": "11.4",
3354+
"version": "11.4.9",
3355+
"notes": "archive.mariadb.org LTS",
3356+
"date_added": "2026-04-02 00:00"
3357+
},
3358+
{
3359+
"name": "mariadb-11.8.6-linux-systemd-x86_64.tar.gz",
3360+
"OS": "Linux",
3361+
"arch": "amd64",
3362+
"url": "https://archive.mariadb.org/mariadb-11.8.6/bintar-linux-systemd-x86_64/mariadb-11.8.6-linux-systemd-x86_64.tar.gz",
3363+
"flavor": "mariadb",
3364+
"minimal": false,
3365+
"size": 0,
3366+
"short_version": "11.8",
3367+
"version": "11.8.6",
3368+
"notes": "archive.mariadb.org short-term",
3369+
"date_added": "2026-04-02 00:00"
34873370
}
34883371
]
34893372
}

‎sandbox/innodb_cluster.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ func CreateInnoDBCluster(sandboxDef SandboxDef, origin string, nodes int, master
197197
// InnoDB Cluster always uses single-primary mode by default
198198
// The primary is node 1, the rest are secondaries
199199
masterList := "1"
200-
slaveList := makeNodesList(nodes)
201-
slaveList = ""
200+
slaveList := ""
202201
for N := 2; N <= nodes; N++ {
203202
if slaveList != "" {
204203
slaveList += " "

‎ts/templates/multi-source/all-masters.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ exec $sb_dir/check_ms_nodes
2424
stdout '# Master 1'
2525
stdout '# Master 2'
2626
stdout '# Master 3'
27-
stdout -count=6 'Slave_IO_Running: Yes'
28-
stdout -count=6 'Slave_SQL_Running: Yes'
27+
stdout -count=6 '(Slave|Replica)_IO_Running: Yes'
28+
stdout -count=6 '(Slave|Replica)_SQL_Running: Yes'
2929
! stderr .
3030

3131
check_sandbox_manifest $sb_dir multi_source

‎ts/templates/multi-source/fan-in.tmpl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ exists $sb_dir
2323
exec $sb_dir/check_ms_nodes
2424
stdout '# Master 1'
2525
stdout '# Master 2'
26-
stdout -count=2 'Slave_IO_Running: Yes'
27-
stdout -count=2 'Slave_SQL_Running: Yes'
26+
stdout -count=2 '(Slave|Replica)_IO_Running: Yes'
27+
stdout -count=2 '(Slave|Replica)_SQL_Running: Yes'
2828
! stderr .
2929

3030
check_sandbox_manifest $sb_dir multi_source
@@ -33,6 +33,7 @@ env required_ports=3
3333
[version_is_at_least:$db_version:8.0.0] env required_ports=6
3434
check_ports $sb_dir $required_ports
3535

36+
sleep 3
3637
exec $HOME/sandboxes/fan_in_msb_{{.DbPathVer}}/test_replication
3738
stdout '# fail: 0'
3839
! stderr .

0 commit comments

Comments
 (0)