Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c2831fa

Browse filesBrowse files
author
Elod Illes
committed
[CI][stable-only] Fix tox-docs job and remove osc-upload-image
tox-docs job job is failing on gate as it misses pkg_resources, given the installed setuptools is newer than 82.0.0, which dropped source code of pkg_resources. the easiest workaround is to cap setuptools to versions that still contain pkg_resources in the tox-docs job. NOTE(elod.illes): to be able to merge this another patch needed to be squashed into this patch: zuul: Remove osc-upload-image, osc-promote-image jobs We are no longer going to publish these images to Dockerhub, given the recent changes to quotas there coupled with the fact that no one appears to be using them [1]. The osc-build-image job is retained to ensure our Dockerfile keeps working. [1] https://lists.openstack.org/archives/list/openstack-discuss@lists.openstack.org/thread/BE7PPQL4DGNDZ2SIMUVSK67I5NF3TFCX/ (cherry picked from commit bb9c7ad) Change-Id: I5911840cc0f84559173c81e7c52236d421746abd Signed-off-by: Elod Illes <elod.illes@est.tech>
1 parent 67f5509 commit c2831fa
Copy full SHA for c2831fa

2 files changed

+3-50Lines changed: 3 additions & 50 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎.zuul.yaml‎

Copy file name to clipboardExpand all lines: .zuul.yaml
+2-50Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -139,22 +139,6 @@
139139
tox_envlist: functional
140140
tox_install_siblings: true
141141

142-
- secret:
143-
name: osc-dockerhub
144-
data:
145-
username: osclientzuul
146-
password: !encrypted/pkcs1-oaep
147-
- LbIZjJiVstRVXMpoLQ3+/JcNB6lKVUWJXXo5+Outf+PKAaO7mNnv8XLiFMKnJ6ftopLyu
148-
hWbX9rA+NddvplLQkf1xxkh7QBBU8PToLr58quI2SENUclt4tpjxbZfZu451kFSNJvNvR
149-
E58cHHpfJZpyRnS2htXmN/Qy24gbV2w7CQxSZD2YhlcrerD8uQ8rWEnlY1wcJEaEGomtS
150-
ZTGxsdK2TsZC2cd4b7TG7+xbl2i+hjADzwSQAgUzlLlwuG71667+IWk4SOZ7OycJTv9NN
151-
ZTak8+CGfiMKdmsxZ1Z8uD7DC+RIklDjMWyly6zuhWzfhOmsmU0CesR50moodRUvbK79p
152-
NZM8u0hBex5cl2EpUEwJL/FSPJXUhDMPoMoTZT/SAuXf25R9eZ9JGrKsIAlmVhpl8ifoE
153-
8TpPyvIHGS3YelTQjhqOX0wGb9T4ZauQCcI5Ajzy9NuCTyD9xxme9OX1zz7gMACRnVHvz
154-
q7U7Ue90MnmGH6E2SgKjIZhyzy9Efwb7JUvH1Zb3hlrjCjEhwi9MV5FnABTEeXyYwE10s
155-
3o/KZg2zvdWkVG6x0dEkjpoQaNuaB7T2Na7Sm421n/z3LCzhiQGuTUjENnL6cMEtuA6Pp
156-
BfI5+Qlg7HMwkBXNB73EPfWHzbCR3VNrzGYTy9FvhGud0/cXsuBXgps4WH63ic=
157-
158142
- job:
159143
name: osc-build-image
160144
parent: opendev-build-docker-image
@@ -164,38 +148,10 @@
164148
- python-builder-3.11-bookworm-container-image
165149
- python-base-3.11-bookworm-container-image
166150
provides: osc-container-image
167-
vars: &osc_image_vars
151+
vars:
168152
docker_images:
169153
- context: .
170-
repository: osclient/python-openstackclient
171-
172-
- job:
173-
name: osc-upload-image
174-
parent: opendev-upload-docker-image
175-
description: Build Docker images and upload to Docker Hub.
176-
allowed-projects: openstack/python-openstackclient
177-
requires:
178-
- python-builder-3.11-bookworm-container-image
179-
- python-base-3.11-bookworm-container-image
180-
provides: osc-container-image
181-
secrets:
182-
- name: docker_credentials
183-
secret: osc-dockerhub
184-
pass-to-parent: true
185-
vars: *osc_image_vars
186-
187-
- job:
188-
name: osc-promote-image
189-
parent: opendev-promote-docker-image
190-
allowed-projects: openstack/python-openstackclient
191-
description: Promote previously uploaded Docker images.
192-
secrets:
193-
- name: docker_credentials
194-
secret: osc-dockerhub
195-
pass-to-parent: true
196-
nodeset:
197-
nodes: []
198-
vars: *osc_image_vars
154+
tags: []
199155

200156
- project-template:
201157
name: osc-tox-unit-tips
@@ -228,8 +184,4 @@
228184
branches: ^master$
229185
gate:
230186
jobs:
231-
- osc-upload-image
232187
- osc-functional-devstack
233-
promote:
234-
jobs:
235-
- osc-promote-image
Collapse file

‎tox.ini‎

Copy file name to clipboardExpand all lines: tox.ini
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ description =
9595
deps =
9696
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.2}
9797
-r{toxinidir}/doc/requirements.txt
98+
setuptools<82.0.0
9899
commands =
99100
sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
100101
sphinx-build -a -E -W -d doc/build/doctrees -b man doc/source doc/build/man

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.