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

⚠️ Remove ironic-lib dependency #608

Merged
merged 1 commit into from
Jan 16, 2025
Merged
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
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ ARG PATCH_LIST
# build arguments for source build customization
ARG UPPER_CONSTRAINTS_FILE=upper-constraints.txt
ARG IRONIC_SOURCE
ARG IRONIC_LIB_SOURCE
ARG SUSHY_SOURCE

COPY sources /sources/
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ The following can serve as an example:
## Custom source for ironic software

When building the ironic image, it is also possible to specify a
different source for ironic, ironic-lib or the sushy library using the build
arguments **IRONIC_SOURCE**, **IRONIC_LIB_SOURCE**, and **SUSHY_SOURCE**.
different source for ironic or the sushy library using the build
arguments **IRONIC_SOURCE** and **SUSHY_SOURCE**.
The accepted formats are gerrit refs, like _refs/changes/89/860689/2_,
commit hashes, like _a1fe6cb41e6f0a1ed0a43ba5e17745714f206f1f_,
repo tags or branches, or a local directory that needs to be under the
Expand Down
2 changes: 1 addition & 1 deletion docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Things you should check before making a release:
for high-level process and possible follow-up actions
- Verify the latest bugfix or stable branches (which is the most recent) in ironic
upstream repository;
- Verify compatibility with latest sushy and ironic-lib upstream releases or master
- Verify compatibility with latest sushy upstream releases or master
branches based on ironic bugfix or stable requirements and constraints
- Verify openstack upper-constraints compatibility with ironic bugfix or stable branches
- Verify any other direct or indirect dependency is uplifted to close any public
Expand Down
9 changes: 0 additions & 9 deletions ironic-packages-list
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@ ironic @ git+https://opendev.org/openstack/ironic@{{ env.IRONIC_SOURCE }}
{% else %}
ironic @ git+https://opendev.org/openstack/ironic
{% endif %}
{% if env.IRONIC_LIB_SOURCE %}
{% if path.isdir('/sources/' + env.IRONIC_LIB_SOURCE) %}
git+file:///sources/{{ env.IRONIC_LIB_SOURCE }}
{% else %}
ironic-lib @ git+https://opendev.org/openstack/ironic-lib@{{ env.IRONIC_LIB_SOURCE }}
{% endif %}
{% else %}
ironic-lib
{% endif %}
ironic-prometheus-exporter
proliantutils
PyMySQL>=0.8.0
Expand Down
4 changes: 0 additions & 4 deletions prepare-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ if [[ -n ${SUSHY_SOURCE:-} ]]; then
sed -i '/^sushy===/d' "${UPPER_CONSTRAINTS_PATH}"
fi

if [[ -n ${IRONIC_LIB_SOURCE:-} ]]; then
sed -i '/^ironic-lib===/d' "${UPPER_CONSTRAINTS_PATH}"
fi

python3 -m pip install --no-cache-dir --ignore-installed --prefix /usr -r "${IRONIC_PKG_LIST_FINAL}" -c "${UPPER_CONSTRAINTS_PATH}"

# ironic system configuration
Expand Down
Loading