particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests: Revert a lorax patch

Browse source 
BZ 1843704 has been fixed and shipped in 8.3. We shouldn't need this
patch anymore!
This commit is contained in:
Alexander Todorov 2021-04-22 12:56:33 +03:00 • committed by Alexander Todorov
parent f570cf51b7
commit ef0105945a
3 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/cases/aws.sh
View file

@ -19,14 +19,6 @@ fi
# Provision the software under tet. # Provision the software under tet.
/usr/libexec/osbuild-composer-test/provision.sh /usr/libexec/osbuild-composer-test/provision.sh
# Apply lorax patch to work around pytoml issues in RHEL 8.x.
# See BZ 1843704 or https://github.com/weldr/lorax/pull/1030 for more details.
if [[ $ID == rhel ]]; then
sudo sed -r -i 's#toml.load\(args\[3\]\)#toml.load(open(args[3]))#' \
/usr/lib/python3.6/site-packages/composer/cli/compose.py
sudo rm -f /usr/lib/python3.6/site-packages/composer/cli/compose.pyc
fi
# We need awscli to talk to AWS. # We need awscli to talk to AWS.
if ! hash aws; then if ! hash aws; then
greenprint "Installing awscli" greenprint "Installing awscli"

8
test/cases/vmware.sh
View file

@ -13,14 +13,6 @@ function greenprint {
# Provision the software under tet. # Provision the software under tet.
/usr/libexec/osbuild-composer-test/provision.sh /usr/libexec/osbuild-composer-test/provision.sh
# Apply lorax patch to work around pytoml issues in RHEL 8.x.
# See BZ 1843704 or https://github.com/weldr/lorax/pull/1030 for more details.
if [[ $ID == rhel ]]; then
sudo sed -r -i 's#toml.load\(args\[3\]\)#toml.load(open(args[3]))#' \
/usr/lib/python3.6/site-packages/composer/cli/compose.py
sudo rm -f /usr/lib/python3.6/site-packages/composer/cli/compose.pyc
fi
GOVC_CMD=/tmp/govc GOVC_CMD=/tmp/govc
# shellcheck source=/dev/null # shellcheck source=/dev/null

8
tools/libvirt_test.sh
View file

@ -26,14 +26,6 @@ if [[ $IMAGE_TYPE == vmdk ]]; then
exit 0 exit 0
fi fi
# Apply lorax patch to work around pytoml issues in RHEL 8.x.
# See BZ 1843704 or https://github.com/weldr/lorax/pull/1030 for more details.
if [[ $ID == rhel ]]; then
sudo sed -r -i 's#toml.load\(args\[3\]\)#toml.load(open(args[3]))#' \
/usr/lib/python3.6/site-packages/composer/cli/compose.py
sudo rm -f /usr/lib/python3.6/site-packages/composer/cli/compose.pyc
fi
# Colorful output. # Colorful output.
function greenprint { function greenprint {
echo -e "\033[1;32m${1}\033[0m" echo -e "\033[1;32m${1}\033[0m"