Skip to content

Commit 431b4ae

Browse files
mnasiadkaopenstack-gerrit
authored andcommitted
Revert "mariadb: pin to 10.11.11"
This reverts commit 535b2f2. Reason for revert: 10.11.12 is revoked upstream Change-Id: I0a8cdc232e5b46cb47e4a3e1b0af7b2402103690
1 parent 535b2f2 commit 431b4ae

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.zuul.d/debian.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
- kolla-build-debian
66
- kolla-build-debian-podman
77
- kolla-ansible-debian
8-
#- kolla-ansible-debian-upgrade
8+
- kolla-ansible-debian-upgrade
99
check-arm64:
1010
jobs:
1111
- kolla-build-debian-aarch64
@@ -15,7 +15,7 @@
1515
- kolla-build-debian
1616
- kolla-build-debian-podman
1717
- kolla-ansible-debian
18-
#- kolla-ansible-debian-upgrade
18+
- kolla-ansible-debian-upgrade
1919
periodic:
2020
jobs:
2121
- kolla-publish-debian-quay

.zuul.d/rocky.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
- kolla-build-rocky9
66
- kolla-build-rocky9-podman
77
- kolla-ansible-rocky9
8-
#- kolla-ansible-rocky9-upgrade
8+
- kolla-ansible-rocky9-upgrade
99
# Test rabbitmq and mariadb in multinode ceph jobs.
1010
- kolla-ansible-rocky9-cephadm:
1111
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
12-
#- kolla-ansible-rocky9-upgrade-cephadm:
13-
# files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
12+
- kolla-ansible-rocky9-upgrade-cephadm:
13+
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
1414
- kolla-ansible-rocky9-ironic:
1515
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
1616
- kolla-ansible-rocky9-swift:
@@ -39,7 +39,7 @@
3939
- kolla-build-rocky9
4040
- kolla-build-rocky9-podman
4141
- kolla-ansible-rocky9
42-
#- kolla-ansible-rocky9-upgrade
42+
- kolla-ansible-rocky9-upgrade
4343
periodic:
4444
jobs:
4545
- kolla-publish-rocky9-quay

.zuul.d/ubuntu.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
- kolla-build-ubuntu
66
- kolla-build-ubuntu-podman
77
- kolla-ansible-ubuntu
8-
#- kolla-ansible-ubuntu-upgrade
8+
- kolla-ansible-ubuntu-upgrade
99
# Test rabbitmq and mariadb in multinode ceph jobs.
1010
- kolla-ansible-ubuntu-cephadm:
1111
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
12-
#- kolla-ansible-ubuntu-upgrade-cephadm:
13-
# files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
12+
- kolla-ansible-ubuntu-upgrade-cephadm:
13+
files: ^docker\/(base|cinder|glance|mariadb|openstack-base|rabbitmq)\/.*
1414
- kolla-ansible-ubuntu-ironic:
1515
files: ^docker\/(base|dnsmasq|ironic|ironic-inspector|iscsid|openstack-base)\/.*
1616
- kolla-ansible-ubuntu-swift:
@@ -39,7 +39,7 @@
3939
- kolla-build-ubuntu
4040
- kolla-build-ubuntu-podman
4141
- kolla-ansible-ubuntu
42-
#- kolla-ansible-ubuntu-upgrade
42+
- kolla-ansible-ubuntu-upgrade
4343
periodic:
4444
jobs:
4545
- kolla-publish-ubuntu-quay

docker/base/mariadb.repo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[mariadb]
22
name = MariaDB Server
3-
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11.11/yum/rhel/$releasever/$basearch
3+
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/$releasever/$basearch
44
gpgcheck = 1
55
enabled = 0
66
module_hotfixes = 1

kolla/template/repos.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ debian:
6767
component: "stable"
6868
gpg_key: "influxdb.asc"
6969
mariadb:
70-
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/debian"
70+
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
7171
suite: "bookworm"
7272
component: "main"
7373
gpg_key: "mariadb.gpg"
@@ -119,7 +119,7 @@ debian-aarch64:
119119
component: "stable"
120120
gpg_key: "influxdb.asc"
121121
mariadb:
122-
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/debian"
122+
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
123123
suite: "bookworm"
124124
component: "main"
125125
gpg_key: "mariadb.gpg"
@@ -213,7 +213,7 @@ ubuntu:
213213
component: "stable"
214214
gpg_key: "influxdb.asc"
215215
mariadb:
216-
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/ubuntu"
216+
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu"
217217
suite: "noble"
218218
component: "main"
219219
gpg_key: "mariadb.gpg"
@@ -266,7 +266,7 @@ ubuntu-aarch64:
266266
component: "stable"
267267
gpg_key: "influxdb.asc"
268268
mariadb:
269-
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11.11/repo/ubuntu"
269+
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu"
270270
suite: "noble"
271271
component: "main"
272272
gpg_key: "mariadb.gpg"

0 commit comments

Comments
 (0)