Skip to content

Commit

Permalink
test: fix ansible os name variable in edge installer
Browse files Browse the repository at this point in the history
  • Loading branch information
mcattamoredhat authored and henrywang committed Jun 4, 2024
1 parent 7d0a92c commit 4a2cebd
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions ostree-ng.sh
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ case "${ID}-${VERSION_ID}" in
HTTP_BOOT_FEAT="true"
SYSROOT_RO="true"
DIRS_FILES_CUSTOMIZATION="true"
ANSIBLE_OS_NAME="rhel-edge"
;;
"centos-8")
OSTREE_REF="centos/8/${ARCH}/edge"
Expand Down Expand Up @@ -538,7 +539,7 @@ EOF
EOF
# Test IoT/Edge OS
greenprint "📼 Run Edge tests on HTTPBOOT VM"
podman run --annotation run.oci.keep_original_groups=1 -v "$(pwd)":/work:z -v "${TEMPDIR}":/tmp:z --rm quay.io/rhel-edge/ansible-runner:latest ansible-playbook -v -i /tmp/inventory -e os_name="${ANSIBLE_OS_NAME}" -e ostree_commit="${INSTALL_HASH}" -e ostree_ref="${ANSIBLE_OS_NAME}:${OSTREE_REF}" -e embedded_container="${EMBEDDED_CONTAINER}" -e sysroot_ro="$SYSROOT_RO" -e test_custom_dirs_files="${DIRS_FILES_CUSTOMIZATION}" check-ostree.yaml || RESULTS=0
podman run --annotation run.oci.keep_original_groups=1 -v "$(pwd)":/work:z -v "${TEMPDIR}":/tmp:z --rm quay.io/rhel-edge/ansible-runner:latest ansible-playbook -v -i /tmp/inventory -e os_name="rhel" -e ostree_commit="${INSTALL_HASH}" -e ostree_ref="rhel:${OSTREE_REF}" -e embedded_container="${EMBEDDED_CONTAINER}" -e sysroot_ro="$SYSROOT_RO" -e test_custom_dirs_files="${DIRS_FILES_CUSTOMIZATION}" check-ostree.yaml || RESULTS=0
check_result

greenprint "🧹 Clean up HTTPBOOT VM"
Expand Down Expand Up @@ -924,7 +925,7 @@ version = "*"
EOF

# ANSIBLE_OS_NAME is a check-ostree.yaml playbook variable defined as "rhel" just for RHEL and CS systems, otherwise is "fedora"
if [[ "${ANSIBLE_OS_NAME}" == "rhel" ]]; then
if [[ "${ANSIBLE_OS_NAME}" == "rhel" || "${ANSIBLE_OS_NAME}" == "rhel-edge" ]]; then
tee -a "$BLUEPRINT_FILE" >> /dev/null << EOF
[customizations.kernel]
name = "kernel-rt"
Expand Down

0 comments on commit 4a2cebd

Please sign in to comment.