From 136f09c5c2a9080c30cc5ac0605d87870deb2087 Mon Sep 17 00:00:00 2001
From: Aurélien Bompard <aurelien@bompard.org>
Date: May 27 2022 13:49:56 +0000
Subject: Test with F36


Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

---

diff --git a/Makefile b/Makefile
index 0741fed..4598ab1 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ TESTDIR := $(shell mktemp --directory /tmp/ipsilon-testdir.XXXXXXXX)
 
 tests:
 	echo "Testdir: $(TESTDIR)"
-	./runtests --path=$(TESTDIR)
+	./runtests --path=$(TESTDIR) -vvvv
 
 test: unittests tests
 
@@ -154,17 +154,17 @@ container-centos8:
 	@(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-centos tests/containers/Dockerfile-rpm tests/containers/Dockerfile-rpm-py3; echo "USER testuser") | sed -e 's/BASE/centos:8/' | docker build -f - -q -t ipsilon-centos8 .
 	@echo "CentOS 8 container built"
 
-container-fedora34:
-	@echo "Building Fedora 34 container ..."
-	@(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm tests/containers/Dockerfile-rpm-py3; echo "USER testuser") | sed -e 's/BASE/fedora:34/' | docker build -f - -t ipsilon-fedora34 .
-	@echo "Fedora 34 container built"
-
 container-fedora35:
 	@echo "Building Fedora 35 container ..."
 	@(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm tests/containers/Dockerfile-rpm-py3; echo "USER testuser") | sed -e 's/BASE/fedora:35/' | docker build -f - -t ipsilon-fedora35 .
 	@echo "Fedora 35 container built"
 
-containers: container-centos7 container-fedora34 container-fedora35
+container-fedora36:
+	@echo "Building Fedora 36 container ..."
+	@(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm tests/containers/Dockerfile-rpm-py3; echo "USER testuser") | sed -e 's/BASE/fedora:36/' | docker build -f - -t ipsilon-fedora36 .
+	@echo "Fedora 36 container built"
+
+containers: container-centos7 container-fedora35 container-fedora36
 	@echo "Containers built"
 
 containertest-centos7: container-centos7
@@ -177,20 +177,20 @@ containertest-centos8: container-centos8
 	@docker run -v `pwd`:/code:z -t --rm ipsilon-centos8
 	@echo "CentOS 8 passed"
 
-containertest-fedora34: container-fedora34
-	@echo "Starting Fedora 34 tests ..."
-	@docker run -v `pwd`:/code:z -t --rm ipsilon-fedora34
-	@echo "Fedora 34 passed"
-
 containertest-fedora35: container-fedora35
 	@echo "Starting Fedora 35 tests ..."
 	@docker run -v `pwd`:/code:z -t --rm ipsilon-fedora35
 	@echo "Fedora 35 passed"
 
-containertest-lint: container-fedora34
+containertest-fedora36: container-fedora36
+	@echo "Starting Fedora 36 tests ..."
+	@docker run -v `pwd`:/code:z -t --rm ipsilon-fedora36
+	@echo "Fedora 36 passed"
+
+containertest-lint: container-fedora35
 	@echo "Starting code lint tests ..."
-	@docker run -v `pwd`:/code:z -t --rm --entrypoint /usr/bin/make ipsilon-fedora34 lint security
+	@docker run -v `pwd`:/code:z -t --rm --entrypoint /usr/bin/make ipsilon-fedora35 lint security
 	@echo "Code lint tests passed"
 
-containertest: containertest-lint containertest-centos7 containertest-fedora34 containertest-fedora35
+containertest: containertest-lint containertest-centos7 containertest-fedora35 containertest-fedora36
 	@echo "Container tests passed"