openstack/openstack-ansible
Code Issues Proposed changes

Merge "Do not try to install packages on each log_instance_info run"

Browse Source
This commit is contained in:
Zuul 2023-11-13 16:10:20 +00:00 committed by Gerrit Code Review
commit 2e93f05e09
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/gate-check-commit.sh
View File

@ -83,8 +83,9 @@ fi
info_block "Checking for required libraries." 2> /dev/null || source "${OSA_CLONE_DIR}/scripts/scripts-library.sh" info_block "Checking for required libraries." 2> /dev/null || source "${OSA_CLONE_DIR}/scripts/scripts-library.sh"
## Main ---------------------------------------------------------------------- ## Main ----------------------------------------------------------------------
# Log some data about the instance and the rest of the system # Log some data about the instance and the rest of the system
gate_log_requirements
log_instance_info log_instance_info
run_dstat || true run_dstat || true

25
scripts/scripts-library.sh
View File

@ -200,6 +200,20 @@ function gate_job_exit_tasks {
log_instance_info log_instance_info
} }
function gate_log_requirements {
# ensure packages are installed to get instance info
determine_distro
case ${DISTRO_ID} in
ubuntu|debian)
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get -y install iproute2 net-tools
;;
rocky|centos|rhel)
dnf -y install iproute
;;
esac
}
function setup_ara { function setup_ara {
# Install ARA and add it to the callback path provided by bootstrap-ansible.sh/openstack-ansible.rc # Install ARA and add it to the callback path provided by bootstrap-ansible.sh/openstack-ansible.rc
# This is added *here* instead of bootstrap-ansible so it's used for CI purposes only. # This is added *here* instead of bootstrap-ansible so it's used for CI purposes only.
@ -245,17 +259,6 @@ function info_block {
} }
function log_instance_info { function log_instance_info {
# ensure packages are installed to get instance info
determine_distro
case ${DISTRO_ID} in
ubuntu|debian)
apt-get update
DEBIAN_FRONTEND=noninteractive apt-get -y install iproute2 net-tools
;;
rocky|centos|rhel)
dnf -y install iproute
;;
esac
set +x set +x
# Get host information post initial setup and reset verbosity # Get host information post initial setup and reset verbosity
if [ ! -d "/openstack/log/instance-info" ];then if [ ! -d "/openstack/log/instance-info" ];then