From 6839390be262f5a51f17e1b8d728f88106385f39 Mon Sep 17 00:00:00 2001 From: Jakub Rusz Date: Wed, 6 Nov 2019 15:50:47 +0100 Subject: [PATCH] test: fix serializing repo_to_source test Travis used fedora-32, this commit changes it to fedora-31. --- Makefile | 4 +++- tests/pylorax/test_projects.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 58711607..591fccd2 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,9 @@ TAG = lorax-$(VERSION)-$(RELEASE) IMAGE_RELEASE = $(shell awk -F: '/FROM/ { print $$2}' Dockerfile.test) 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 export TEST_OS VM_IMAGE=$(CURDIR)/test/images/$(TEST_OS) diff --git a/tests/pylorax/test_projects.py b/tests/pylorax/test_projects.py index abe88d20..be3244b1 100644 --- a/tests/pylorax/test_projects.py +++ b/tests/pylorax/test_projects.py @@ -330,7 +330,7 @@ def singlerepo_v0(): "check_gpg": True, "check_ssl": True, "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", "system": False,