From 2cab2e4143446fd5fa3148c4f3df084a15c79ee6 Mon Sep 17 00:00:00 2001
From: Jay Faulkner <jay@jvf.cc>
Date: Tue, 14 Jan 2025 14:25:29 -0800
Subject: [PATCH] Deprecate ironic-lib

Ironic-lib code has been rolled into Ironic-Python-Agent and Ironic
where used; we no longer should support installing ironic-lib on master
versions of IPA-builder.

Depends-On: https://review.opendev.org/c/openstack/ironic-python-agent/+/937743
Change-Id: I29acfa275adc6aa3ec187883e6a096bf4038e9f6
---
 .../60-ironic-python-agent-ramdisk-install        |  7 -------
 .../source-repository-ironic-lib                  |  1 -
 doc/source/admin/dib.rst                          |  8 --------
 doc/source/admin/tinyipa.rst                      | 12 ------------
 doc/source/contributor/index.rst                  |  9 ---------
 tinyipa/build-tinyipa.sh                          | 15 ---------------
 6 files changed, 52 deletions(-)
 delete mode 100644 dib/ironic-python-agent-ramdisk/source-repository-ironic-lib

diff --git a/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install b/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install
index c39c6cf..da8e7b2 100755
--- a/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install
+++ b/dib/ironic-python-agent-ramdisk/install.d/ironic-python-agent-ramdisk-source-install/60-ironic-python-agent-ramdisk-install
@@ -10,7 +10,6 @@ export LC_ALL=C.UTF-8
 
 SCRIPTDIR=$(dirname $0)
 IPADIR=/tmp/ironic-python-agent
-IRLIBDIR=/tmp/ironic-lib
 UPPER_CONSTRAINTS=/tmp/requirements/upper-constraints.txt
 VENVDIR=/opt/ironic-python-agent
 
@@ -46,12 +45,6 @@ $VENVDIR/bin/pip install -c $UPPER_CONSTRAINTS $IPADIR
 ln -s $VENVDIR/bin/ironic-python-agent /usr/local/bin/
 ln -s $VENVDIR/bin/ironic-collect-introspection-data /usr/local/bin/
 
-# install ironic-lib from source if requested
-if [ ${IRONIC_LIB_FROM_SOURCE:-false} == "true" ]; then
-    $VENVDIR/bin/pip install -c $UPPER_CONSTRAINTS -r $IRLIBDIR/requirements.txt
-    $VENVDIR/bin/pip install $IRLIBDIR
-fi
-
 case "$DIB_INIT_SYSTEM" in
     upstart)
         install -D -g root -o root -m 0755 ${SCRIPTDIR}/ironic-python-agent.conf /etc/init/ironic-python-agent.conf
diff --git a/dib/ironic-python-agent-ramdisk/source-repository-ironic-lib b/dib/ironic-python-agent-ramdisk/source-repository-ironic-lib
deleted file mode 100644
index 183f5a9..0000000
--- a/dib/ironic-python-agent-ramdisk/source-repository-ironic-lib
+++ /dev/null
@@ -1 +0,0 @@
-ironic-lib git /tmp/ironic-lib https://opendev.org/openstack/ironic-lib
diff --git a/doc/source/admin/dib.rst b/doc/source/admin/dib.rst
index 51fcfd8..fddbed4 100644
--- a/doc/source/admin/dib.rst
+++ b/doc/source/admin/dib.rst
@@ -84,14 +84,6 @@ To use a specific branch of ironic-python-agent, use:
     export DIB_REPOREF_ironic_python_agent=origin/stable/queens
     export DIB_REPOREF_requirements=origin/stable/queens
 
-To build ironic-lib from source, do:
-
-.. code-block:: bash
-
-    export IRONIC_LIB_FROM_SOURCE=true
-    # Optionally:
-    #export DIB_REPOREF_ironic_lib=<branch>
-
 To build image for architectures other than amd64, you can either set the
 ``ARCH`` environment variable or use ``-a`` to specify the target
 architecture:
diff --git a/doc/source/admin/tinyipa.rst b/doc/source/admin/tinyipa.rst
index 63d6467..4d2187b 100644
--- a/doc/source/admin/tinyipa.rst
+++ b/doc/source/admin/tinyipa.rst
@@ -154,18 +154,6 @@ If you want to collect BIOS given names of NICs in the inventory, set
 
     export TINYIPA_REQUIRE_BIOSDEVNAME=true
 
-Using ironic-lib from source
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-ironic-lib_ contains important parts of the provisioning logic. If you would
-like to build an IPA image with your local checkout of ironic-lib_, export
-the following variable:
-
-.. code-block:: bash
-
-    export IRONIC_LIB_SOURCE=/absolute/path/to/ironic-lib/checkout
-
 
 .. _Ironic Python Agent: https://docs.openstack.org/ironic-python-agent
 .. _TinyCoreLinux: http://tinycorelinux.net
-.. _ironic-lib: https://opendev.org/openstack/ironic-lib
diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst
index 7d43b84..f0a832d 100644
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -22,12 +22,3 @@ rebuilding an image with the following procedure.
         DIB_REPOREF_ironic_python_agent=my-test-branch \
         ironic-python-agent-builder -o my-ipa --release 9-stream centos
 
-#. A similar process (with one additional variable) can be used for ironic-lib
-   changes:
-
-   .. code-block:: bash
-
-    DIB_REPOLOCATION_ironic_lib=/home/user/path/to/repo \
-        DIB_REPOREF_ironic_lib=my-test-branch \
-        IRONIC_LIB_FROM_SOURCE=true \
-        ironic-python-agent-builder -o my-ipa --release 9-stream centos
diff --git a/tinyipa/build-tinyipa.sh b/tinyipa/build-tinyipa.sh
index 607ad38..78a9d5f 100755
--- a/tinyipa/build-tinyipa.sh
+++ b/tinyipa/build-tinyipa.sh
@@ -82,14 +82,6 @@ $PYTHON_COMMAND setup.py sdist --dist-dir "$BUILDDIR/tmp/localpip" --quiet
 ls $BUILDDIR/tmp/localpip || true
 cp requirements.txt $BUILDDIR/tmp/ipa-requirements.txt
 
-if [ -n "$IRONIC_LIB_SOURCE" ]; then
-    pushd $IRONIC_LIB_SOURCE
-    rm -rf *.egg-info
-    $PYTHON_COMMAND setup.py sdist --dist-dir "$BUILDDIR/tmp/localpip" --quiet
-    cp requirements.txt $BUILDDIR/tmp/ironic-lib-requirements.txt
-    popd
-fi
-
 if [ -n "$PYTHON_EXTRA_SOURCES_DIR_LIST" ]; then
     IFS="," read -ra PKGDIRS <<< "$PYTHON_EXTRA_SOURCES_DIR_LIST"
     for PKGDIR in "${PKGDIRS[@]}"; do
@@ -105,9 +97,6 @@ if [ -n "$PYTHON_EXTRA_SOURCES_DIR_LIST" ]; then
 fi
 
 $WORKDIR/generate_tox_constraints.sh upper-constraints.txt
-if [ -n "$IRONIC_LIB_SOURCE" ]; then
-    sed -i '/ironic-lib/d' upper-constraints.txt $BUILDDIR/tmp/ipa-requirements.txt
-fi
 cp upper-constraints.txt $BUILDDIR/tmp/upper-constraints.txt
 echo Using upper-constraints:
 cat upper-constraints.txt
@@ -165,10 +154,6 @@ $CHROOT_CMD ${TINYIPA_PYTHON_EXE} -m ensurepip
 $CHROOT_CMD ${PIP_COMMAND} install --upgrade pip==${PIP_VERSION} wheel
 $CHROOT_CMD ${PIP_COMMAND} install pbr
 $CHROOT_CMD ${PIP_COMMAND} wheel -c /tmp/upper-constraints.txt --wheel-dir /tmp/wheels -r /tmp/ipa-requirements.txt
-if [ -n "$IRONIC_LIB_SOURCE" ]; then
-    $CHROOT_CMD ${PIP_COMMAND} wheel -c /tmp/upper-constraints.txt --wheel-dir /tmp/wheels -r /tmp/ironic-lib-requirements.txt
-    $CHROOT_CMD ${PIP_COMMAND} wheel -c /tmp/upper-constraints.txt --no-index --pre --wheel-dir /tmp/wheels --find-links=/tmp/localpip --find-links=/tmp/wheels ironic-lib
-fi
 
 if [ -n "$PYTHON_EXTRA_SOURCES_DIR_LIST" ]; then
     IFS="," read -ra PKGDIRS <<< "$PYTHON_EXTRA_SOURCES_DIR_LIST"