test/api.sh: Drop distro aliases and dot-notation
This reverts commit2fe5e01d4dwith the exception of the changes in tools/provision.sh. This functionality is covered by unit tests in osbuild/images:aaa53adc3c/pkg/distrofactory/distrofactory_test.go (L9)
This commit is contained in:
parent
f02fe86366
commit
bdc973d085
9 changed files with 36 additions and 162 deletions
|
|
@ -75,16 +75,6 @@ function _instanceCheck() {
|
|||
else
|
||||
echo "firewalld not available on host, that's fine"
|
||||
fi
|
||||
|
||||
if [[ "${TEST_DISTRO_ALIAS}" == "1" ]]; then
|
||||
echo "✔️ Checking DNF config of an image built using distro alias"
|
||||
DNF_VARS_RELEASEVER=$($_ssh cat /etc/dnf/vars/releasever)
|
||||
if [[ "$DNF_VARS_RELEASEVER" != "$VERSION_ID" ]]; then
|
||||
echo "DNF config of an image built using distro alias has wrong releasever: $DNF_VARS_RELEASEVER"
|
||||
echo "Expected: $VERSION_ID"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
WORKER_REFRESH_TOKEN_PATH="/etc/osbuild-worker/token"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ function createReqFileEdge() {
|
|||
|
||||
cat > "$REQUEST_FILE" << EOF
|
||||
{
|
||||
"distribution": "$DISTRO_NAME",
|
||||
"distribution": "$DISTRO",
|
||||
"customizations": {
|
||||
"payload_repositories": [
|
||||
{
|
||||
|
|
@ -62,7 +62,7 @@ EOF
|
|||
function createReqFileGuest() {
|
||||
cat > "$REQUEST_FILE" << EOF
|
||||
{
|
||||
"distribution": "$DISTRO_NAME",
|
||||
"distribution": "$DISTRO",
|
||||
"customizations": {
|
||||
"payload_repositories": [
|
||||
{
|
||||
|
|
@ -103,7 +103,7 @@ EOF
|
|||
function createReqFileVSphere() {
|
||||
cat > "$REQUEST_FILE" << EOF
|
||||
{
|
||||
"distribution": "$DISTRO_NAME",
|
||||
"distribution": "$DISTRO",
|
||||
"customizations": {
|
||||
"payload_repositories": [
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue