Skip to content

Commit

Permalink
Merge pull request #608 from elfosardo/remove-ironic-lib
Browse files Browse the repository at this point in the history
⚠️ Remove ironic-lib dependency
  • Loading branch information
metal3-io-bot authored Jan 16, 2025
2 parents 01a282a + f987dec commit 9f66b9d
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 17 deletions.
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

0 comments on commit 9f66b9d

Please sign in to comment.