test: fix serializing repo_to_source test

Travis used fedora-32, this commit changes it to fedora-31.
This commit is contained in:
Jakub Rusz 2019-11-06 15:50:47 +01:00 committed by Brian C. Lane
parent fad9b324f7
commit 6839390be2
2 changed files with 4 additions and 2 deletions

View File

@ -14,7 +14,9 @@ TAG = lorax-$(VERSION)-$(RELEASE)
IMAGE_RELEASE = $(shell awk -F: '/FROM/ { print $$2}' Dockerfile.test) IMAGE_RELEASE = $(shell awk -F: '/FROM/ { print $$2}' Dockerfile.test)
ifeq ($(TEST_OS),) ifeq ($(TEST_OS),)
TEST_OS = fedora-30 OS_ID = $(shell awk -F= '/^ID/ {print $$2}' /etc/os-release)
OS_VERSION = $(shell awk -F= '/^VERSION_ID/ {print $$2}' /etc/os-release)
TEST_OS = $(OS_ID)-$(OS_VERSION)
endif endif
export TEST_OS export TEST_OS
VM_IMAGE=$(CURDIR)/test/images/$(TEST_OS) VM_IMAGE=$(CURDIR)/test/images/$(TEST_OS)

View File

@ -330,7 +330,7 @@ def singlerepo_v0():
"check_gpg": True, "check_gpg": True,
"check_ssl": True, "check_ssl": True,
"gpgkey_urls": [ "gpgkey_urls": [
"file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-32-x86_64" "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-" + os.environ['TEST_OS'] + "-x86_64"
], ],
"name": "single-repo", "name": "single-repo",
"system": False, "system": False,