openstack/ironic-python-agent-builder
Code Issues Proposed changes

Merge "Centralize variables"

Browse Source
This commit is contained in:
Zuul 2021-03-17 13:09:06 +00:00 committed by Gerrit Code Review
commit 18269beefd
4 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tinyipa/build-tinyipa.sh
View File

@ -3,30 +3,18 @@
set -ex set -ex
WORKDIR=$(readlink -f $0 | xargs dirname) WORKDIR=$(readlink -f $0 | xargs dirname)
source ${WORKDIR}/common.sh source ${WORKDIR}/common.sh
BUILDDIR="$WORKDIR/tinyipabuild"
TINYCORE_MIRROR_URL=${TINYCORE_MIRROR_URL:-}
TINYIPA_REQUIRE_BIOSDEVNAME=${TINYIPA_REQUIRE_BIOSDEVNAME:-false}
TINYIPA_REQUIRE_IPMITOOL=${TINYIPA_REQUIRE_IPMITOOL:-true}
IRONIC_LIB_SOURCE=${IRONIC_LIB_SOURCE:-}
USE_PYTHON3=${USE_PYTHON3:-True}
TC_RELEASE="12.x"
IRONIC_LIB_SOURCE=${IRONIC_LIB_SOURCE:-}
TC_RELEASE="12.x"
TGT_RELEASE="v1.0.80" TGT_RELEASE="v1.0.80"
QEMU_RELEASE="v4.2.0" QEMU_RELEASE="v4.2.0"
LSHW_RELEASE="B.02.18" LSHW_RELEASE="B.02.18"
BIOSDEVNAME_RELEASE="0.7.2" BIOSDEVNAME_RELEASE="0.7.2"
IPMITOOL_GIT_HASH="710888479332a46bad78f3d736eff0cbdefd2d1b" IPMITOOL_GIT_HASH="710888479332a46bad78f3d736eff0cbdefd2d1b"
# PYTHON_EXTRA_SOURCES_DIR_LIST is a csv list of python package dirs to include
PYTHON_EXTRA_SOURCES_DIR_LIST=${PYTHON_EXTRA_SOURCES_DIR_LIST:-}
CHROOT_PATH="/tmp/overides:/usr/local/sbin:/usr/local/bin:/apps/bin:/usr/sbin:/usr/bin:/sbin:/bin"
CHROOT_CMD="sudo chroot $BUILDDIR /usr/bin/env -i PATH=$CHROOT_PATH http_proxy=$http_proxy https_proxy=$https_proxy no_proxy=$no_proxy" CHROOT_CMD="sudo chroot $BUILDDIR /usr/bin/env -i PATH=$CHROOT_PATH http_proxy=$http_proxy https_proxy=$https_proxy no_proxy=$no_proxy"
TC=1001
STAFF=50
function clone_single_branch { function clone_single_branch {
git clone --branch $3 --depth=1 $1 $2 git clone --branch $3 --depth=1 $1 $2
} }

9
tinyipa/common.sh
View File

@ -3,8 +3,17 @@
WORKDIR=$(readlink -f $0 | xargs dirname) WORKDIR=$(readlink -f $0 | xargs dirname)
source ${WORKDIR}/tc-mirror.sh source ${WORKDIR}/tc-mirror.sh
BUILDDIR="$WORKDIR/tinyipabuild"
PIP_VERSION="20.2.2" PIP_VERSION="20.2.2"
TINYIPA_REQUIRE_BIOSDEVNAME=${TINYIPA_REQUIRE_BIOSDEVNAME:-false}
TINYIPA_REQUIRE_IPMITOOL=${TINYIPA_REQUIRE_IPMITOOL:-true}
USE_PYTHON3=${USE_PYTHON3:-True}
# PYTHON_EXTRA_SOURCES_DIR_LIST is a csv list of python package dirs to include
PYTHON_EXTRA_SOURCES_DIR_LIST=${PYTHON_EXTRA_SOURCES_DIR_LIST:-}
# Allow an extension to be added to the generated files by specifying # Allow an extension to be added to the generated files by specifying
# $BRANCH_PATH e.g. export BRANCH_PATH=master results in tinyipa-master.gz etc # $BRANCH_PATH e.g. export BRANCH_PATH=master results in tinyipa-master.gz etc
BRANCH_EXT='' BRANCH_EXT=''

7
tinyipa/finalise-tinyipa.sh
View File

@ -6,20 +6,13 @@ FINALDIR="$WORKDIR/tinyipafinal"
DST_DIR=$FINALDIR DST_DIR=$FINALDIR
source ${WORKDIR}/common.sh source ${WORKDIR}/common.sh
BUILDDIR="$WORKDIR/tinyipabuild"
BUILD_AND_INSTALL_TINYIPA=${BUILD_AND_INSTALL_TINYIPA:-true} BUILD_AND_INSTALL_TINYIPA=${BUILD_AND_INSTALL_TINYIPA:-true}
TINYCORE_MIRROR_URL=${TINYCORE_MIRROR_URL:-}
INSTALL_SSH=${INSTALL_SSH:-true} INSTALL_SSH=${INSTALL_SSH:-true}
AUTHORIZE_SSH=${AUTHORIZE_SSH:-false} AUTHORIZE_SSH=${AUTHORIZE_SSH:-false}
SSH_PUBLIC_KEY=${SSH_PUBLIC_KEY:-} SSH_PUBLIC_KEY=${SSH_PUBLIC_KEY:-}
PYOPTIMIZE_TINYIPA=${PYOPTIMIZE_TINYIPA:-false} PYOPTIMIZE_TINYIPA=${PYOPTIMIZE_TINYIPA:-false}
TINYIPA_REQUIRE_BIOSDEVNAME=${TINYIPA_REQUIRE_BIOSDEVNAME:-false}
TINYIPA_REQUIRE_IPMITOOL=${TINYIPA_REQUIRE_IPMITOOL:-true}
TINYIPA_UDEV_SETTLE_TIMEOUT=${TINYIPA_UDEV_SETTLE_TIMEOUT:-60} TINYIPA_UDEV_SETTLE_TIMEOUT=${TINYIPA_UDEV_SETTLE_TIMEOUT:-60}
USE_PYTHON3=${USE_PYTHON3:-True}
PYTHON_EXTRA_SOURCES_DIR_LIST=${PYTHON_EXTRA_SOURCES_DIR_LIST:-}
echo "Finalising tinyipa:" echo "Finalising tinyipa:"

2
tinyipa/tc-mirror.sh
View File

@ -16,6 +16,8 @@ http://ftp.vim.org/os/Linux/distr/tinycorelinux
http://mirrors.163.com/tinycorelinux http://mirrors.163.com/tinycorelinux
" "
TINYCORE_MIRROR_URL=${TINYCORE_MIRROR_URL:-}
# NOTE(TheJulia): Removed mirrors because they are out # NOTE(TheJulia): Removed mirrors because they are out
# of date # of date
# http://distro.ibiblio.org/tinycorelinux ~1.5 months out of sync. # http://distro.ibiblio.org/tinycorelinux ~1.5 months out of sync.