Skip to content

Commit

Permalink
CODEOWNERS: add kleinffm for CODEOWNERS
Browse files Browse the repository at this point in the history
Felicia has being working in docs in the entire automobile
project. I would like to suggest Felicia as co-maintainer of QM project
so she is able to keep her sharp eyes in the docs and in the project as
well so we follow all the docs good practices and also make sure we
include in our new patches documentation so in few year nobody get lost.

Signed-off-by: Douglas Schilling Landgraf <[email protected]>

Rebase from 575

Signed-off-by: nsednev <[email protected]>

Code improovements suggested by reviewers.
Signed-off-by: nsednev <[email protected]>

Removed trailing spaces.
Signed-off-by: nsednev <[email protected]>

Removed trailing spaces.
Signed-off-by: nsednev <[email protected]>
  • Loading branch information
dougsland authored and nsednev committed Sep 26, 2024
1 parent ed4d501 commit 185a1c0
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

# Default to all maintainers if nothing more specific matches
* @rhatdan @lsm5 @dougsland @yarboa @sandrobonazzola @nsednev @aesteve-rh @pengshanyu
* @rhatdan @lsm5 @dougsland @yarboa @sandrobonazzola @nsednev @aesteve-rh @pengshanyu @kleinffm
43 changes: 43 additions & 0 deletions tests/ffi/common/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,30 @@
. ../../e2e/lib/utils

DROP_IN_DIR="/etc/containers/systemd/qm.container.d/"
OSTREE_PATH="/run/ostree"
export QM_HOST_REGISTRY_DIR="/var/qm/lib/containers/registry"
export QM_REGISTRY_DIR="/var/lib/containers/registry"
export QM_TMP_DIR="/var/tmp.dir"
export CONTAINERS_CONF_DIR="/etc/qm/containers/containers.conf.d"
export QM_IMAGE_TMP_DIR_CONF="qm_image_tmp_dir.conf"

# Checks if the system is running under OSTree.
# This function determines if the system is using OSTree by checking for the
# existence of the directory specified by the OSTREE_PATH environment variable.
# Returns:
# 0 (success) if the OSTREE_PATH directory exists, indicating the system is
# running under OSTree.
# 1 (failure) if the OSTREE_PATH directory does not exist, indicating the
# system is not running under OSTree.
is_ostree() {
if [ -d "${OSTREE_PATH}" ]; then
echo "The system is running under OSTree."
return 0
else
echo "The system is not running under OSTree."
return 1
fi
}

prepare_test() {
# Search variables for update file in qm.container
Expand Down Expand Up @@ -37,6 +59,27 @@ reload_config() {
}

prepare_images() {
# Update container image_copy_tmp_dir if the image is an OStree.
# Default location for storing temporary container image content. Can be overridden with the TMPDIR environment
# variable. If you specify "storage", then the location of the
# container/storage tmp directory will be used.
# By default image_copy_tmp_dir="/var/tmp"
# This is a work around and it should not be used constantly
# This script checks if the directory /run/ostree exists.
# If it does, it executes the following commands:
# 1. Creates the directory /var/qm/tmp.dir if it does not already exist.
# 2. Creates the directory /etc/qm/containers/containers.conf.d if it does not already exist.
# 3. Writes a configuration file qm_image_tmp_dir.conf in /etc/qm/containers/containers.conf.d
# with the content specifying the temporary directory for image copying as /var/tmp.dir.

if [ -d /run/ostree ]; then
exec_cmd "mkdir -p /var/qm/tmp.dir"
#exec_cmd "mkdir -p /etc/qm/containers/containers.conf.d"
exec_cmd "mkdir -p ${CONTAINERS_CONF_DIR}"
#exec_cmd "echo -e '[engine]\nimage_copy_tmp_dir=\"/var/tmp.dir\"' > /etc/qm/containers/containers.conf.d/qm_image_tmp_dir.conf"
exec_cmd "echo -e '[engine]\nimage_copy_tmp_dir=\"${QM_TMP_DIR}\"' > ${CONTAINERS_CONF_DIR}/${QM_IMAGE_TMP_DIR_CONF}"
fi

exec_cmd "podman pull quay.io/centos-sig-automotive/ffi-tools:latest"
# Copy container image registry to /var/qm/lib/containers
image_id=$(podman images | grep quay.io/centos-sig-automotive/ffi-tools | awk -F " " '{print $3}')
Expand Down

0 comments on commit 185a1c0

Please sign in to comment.