Skip to content

Commit 4aee300

Browse files
tox pipeline error fix
1 parent fe2ad1f commit 4aee300

File tree

2 files changed

+0
-67
lines changed

2 files changed

+0
-67
lines changed

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_vers
5151
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
5252
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
5353
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_multiarch_rocky_9_sig_security_common_version }}"
54-
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_multiarch_rocky_9_sig_security_common_version }}"
5554

5655
# Rocky-and-CI-specific Pulp urls
5756
stackhpc_include_os_minor_version_in_repo_url: true

etc/kayobe/stackhpc.yml

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
6262

6363
# RabbitMQ - Erlang for RHEL 9
6464
stackhpc_repo_rhel9_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel9_rabbitmq_erlang_version }}"
65-
stackhpc_repo_rhel9_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/9/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel9_rabbitmq_erlang_version }}"
6665
stackhpc_repo_rhel9_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"
6766
# RabbitMQ - Erlang 26 for RHEL 9 (aarch64)
6867
stackhpc_repo_rhel9_rabbitmq_erlang_26_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang-26/el/9/aarch64/{{ stackhpc_repo_rhel9_rabbitmq_erlang_26_version }}"
@@ -78,7 +77,6 @@ stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
7877

7978
# CentOS Stream 9 - NFV OpenvSwitch
8079
stackhpc_repo_centos_stream_9_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/nfv/{{ kolla_base_arch }}/openvswitch-2/{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_version }}"
81-
stackhpc_repo_centos_stream_9_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/nfv/{{ kolla_base_arch }}/openvswitch-2/{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_version }}"
8280
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"
8381

8482
# CentOS Stream 9 - OpenStack Epoxy
@@ -95,22 +93,18 @@ stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_repo_dist
9593

9694
# CentOS Stream 9 Docker CE
9795
stackhpc_repo_centos_stream_9_docker_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/docker-ce/centos/9/{{ kolla_base_arch }}/stable/{{ stackhpc_repo_centos_stream_9_docker_version }}"
98-
stackhpc_repo_centos_stream_9_docker_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/docker-ce/centos/9/{{ kolla_base_arch }}/stable/{{ stackhpc_repo_centos_stream_9_docker_version }}"
9996
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_repo_distribution }}"
10097

10198
# TreasureData 5 for RHEL 9
10299
stackhpc_repo_rhel_9_treasuredata_5_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/treasuredata/5/redhat/9/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel_9_treasuredata_5_version }}"
103-
stackhpc_repo_rhel_9_treasuredata_5_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/treasuredata/5/redhat/9/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel_9_treasuredata_5_version }}"
104100
stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_repo_distribution }}"
105101

106102
# MariaDB 10.11 for RHEL 9
107103
stackhpc_repo_rhel_9_mariadb_10_11_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.11/yum/rhel/9/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel_9_mariadb_10_11_version }}"
108-
stackhpc_repo_rhel_9_mariadb_10_11_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.11/yum/rhel/9/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel_9_mariadb_10_11_version }}"
109104
stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_repo_distribution }}"
110105

111106
# InfluxDB for RHEL 9
112107
stackhpc_repo_rhel_9_influxdb_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/influxdb/rhel/9/{{ kolla_base_arch }}/stable/{{ stackhpc_repo_rhel_9_influxdb_version }}"
113-
stackhpc_repo_rhel_9_influxdb_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/influxdb/rhel/9/{{ kolla_base_arch }}/stable/{{ stackhpc_repo_rhel_9_influxdb_version }}"
114108
stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_repo_distribution }}"
115109

116110
# OpenSearch for RHEL 9
@@ -127,106 +121,46 @@ stackhpc_repo_almalinux_9_proxysql_2_7_version: "{{ stackhpc_repo_distribution }
127121

128122
# Rocky 9 AppStream
129123
stackhpc_repo_rocky_9_appstream_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/AppStream/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_9_appstream_version }}"
130-
stackhpc_repo_rocky_9_appstream_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/AppStream/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_9_appstream_version }}"
131124
stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_repo_distribution }}"
132125

133126
# Rocky 9 BaseOS
134127
stackhpc_repo_rocky_9_baseos_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/BaseOS/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_9_baseos_version }}"
135-
stackhpc_repo_rocky_9_baseos_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/BaseOS/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_9_baseos_version }}"
136128
stackhpc_repo_rocky_9_baseos_version: "{{ stackhpc_repo_distribution }}"
137129

138130
# Rocky 9 CRB
139131
stackhpc_repo_rocky_9_crb_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/CRB/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_9_crb_version }}"
140-
stackhpc_repo_rocky_9_crb_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/CRB/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_9_crb_version }}"
141132
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_repo_distribution }}"
142133

143134
# Rocky 9 extras
144135
stackhpc_repo_rocky_9_extras_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/extras/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_9_extras_version }}"
145-
stackhpc_repo_rocky_9_extras_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/extras/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_9_extras_version }}"
146136
stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_repo_distribution }}"
147137

148138
# Rocky 9 highavailability
149139
stackhpc_repo_rocky_9_highavailability_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/highavailability/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_9_highavailability_version }}"
150-
stackhpc_repo_rocky_9_highavailability_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/highavailability/{{ kolla_base_arch }}/os/{{ stackhpc_repo_rocky_9_highavailability_version }}"
151140
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_repo_distribution }}"
152141

153142
# Rocky 9 SIG Security Common
154143
stackhpc_repo_rocky_9_sig_security_common_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/sig/9/security/{{ kolla_base_arch }}/security-common/{{ stackhpc_repo_rocky_9_sig_security_common_version }}"
155-
stackhpc_repo_rocky_9_sig_security_common_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/sig/9/security/{{ kolla_base_arch }}/security-common/{{ stackhpc_repo_rocky_9_sig_security_common_version }}"
156144
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_repo_distribution }}"
157145

158146
# EPEL 9
159147
stackhpc_repo_epel_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/epel/9/Everything/{{ kolla_base_arch }}/{{ stackhpc_repo_epel_9_version }}"
160-
stackhpc_repo_epel_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/epel/9/Everything/{{ kolla_base_arch }}/{{ stackhpc_repo_epel_9_version }}"
161148
stackhpc_repo_epel_9_version: "{{ stackhpc_repo_distribution }}"
162149

163150
# ELRepo 9
164151
stackhpc_repo_elrepo_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/elrepo/elrepo/el9/{{ kolla_base_arch }}/{{ stackhpc_repo_elrepo_9_version }}"
165-
stackhpc_repo_elrepo_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/elrepo/elrepo/el9/{{ kolla_base_arch }}/{{ stackhpc_repo_elrepo_9_version }}"
166152
stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
167153

168154
###############################################################################
169155
# Sources
170156

171157
# Kolla source repository.
172158
stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
173-
<<<<<<< HEAD
174-
<<<<<<< HEAD
175-
<<<<<<< HEAD
176-
<<<<<<< HEAD
177-
<<<<<<< HEAD
178-
<<<<<<< HEAD
179159
stackhpc_kolla_source_version: stackhpc/20.2.0.4
180-
=======
181-
stackhpc_kolla_source_version: stackhpc/18.7.0.11
182-
>>>>>>> 512f5389 (Bump kolla to stackhpc/18.7.0.11)
183-
=======
184-
stackhpc_kolla_source_version: stackhpc/18.7.0.12
185-
>>>>>>> 4877398f (Bump kolla to stackhpc/18.7.0.12)
186-
=======
187-
stackhpc_kolla_source_version: stackhpc/18.7.0.13
188-
>>>>>>> 599ce98a (rocky/aarch64: switch to versioned Erlang 26/27 repos (#1870))
189-
=======
190-
stackhpc_kolla_source_version: stackhpc/18.8.0.1
191-
>>>>>>> 82c628b3 (Bump kolla to stackhpc/18.8.0.1)
192-
=======
193-
stackhpc_kolla_source_version: stackhpc/18.8.0.2
194-
>>>>>>> 50cf6845 (Bump kolla to stackhpc/18.8.0.2)
195-
=======
196-
stackhpc_kolla_source_version: stackhpc/18.8.0.3
197-
>>>>>>> fb12106a (Bump kolla to stackhpc/18.8.0.3)
198160

199161
# Kolla Ansible source repository.
200162
stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
201-
<<<<<<< HEAD
202-
<<<<<<< HEAD
203-
<<<<<<< HEAD
204-
<<<<<<< HEAD
205-
<<<<<<< HEAD
206-
<<<<<<< HEAD
207-
<<<<<<< HEAD
208163
stackhpc_kolla_ansible_source_version: stackhpc/20.2.0.9
209-
=======
210-
stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.12
211-
>>>>>>> eb557894 (Bump kolla-ansible to stackhpc/18.7.0.12)
212-
=======
213-
stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.13
214-
>>>>>>> 51b66c70 (Bump kolla-ansible to stackhpc/18.7.0.13)
215-
=======
216-
stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.14
217-
>>>>>>> 5eb18c86 (Bump kolla-ansible to stackhpc/18.7.0.14 (#1856))
218-
=======
219-
stackhpc_kolla_ansible_source_version: stackhpc/18.7.0.15
220-
>>>>>>> d53541f1 (Bump kolla-ansible to stackhpc/18.7.0.15)
221-
=======
222-
stackhpc_kolla_ansible_source_version: stackhpc/18.8.0.1
223-
>>>>>>> 57717c77 (Bump kolla-ansible to stackhpc/18.8.0.1)
224-
=======
225-
stackhpc_kolla_ansible_source_version: stackhpc/18.8.0.2
226-
>>>>>>> a4f80359 (Bump kolla-ansible to stackhpc/18.8.0.2)
227-
=======
228-
stackhpc_kolla_ansible_source_version: stackhpc/18.8.0.3
229-
>>>>>>> b9168d4f (Bump kolla-ansible to stackhpc/18.8.0.3)
230164

231165
###############################################################################
232166
# Container image registry

0 commit comments

Comments
 (0)