e544327064
- Bump leapp-framework to 6.2 - Add possibility to specify aliases for CLI option - Update test plans for IPU 9.8 -> 10.2 - Resolves: RHEL-128269
71 lines
2.7 KiB
Diff
71 lines
2.7 KiB
Diff
From 723b17561251a1b5fa01518966483c573142ac8e Mon Sep 17 00:00:00 2001
|
|
From: Tomas Fratrik <tfratrik@redhat.com>
|
|
Date: Tue, 19 Aug 2025 14:31:51 +0200
|
|
Subject: [PATCH 2/3] Update build container up to f42
|
|
|
|
* Add installation of python3-setuptools
|
|
* Drop fedora versions 35-40
|
|
|
|
Jira: RHELMISC-13271
|
|
---
|
|
Makefile | 8 ++++----
|
|
res/container-builds/Containerfile.fedora_generic | 2 +-
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 1dc9a29..a68b8fe 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -82,7 +82,7 @@ help:
|
|
@echo " build create the RPM"
|
|
@echo " build_container create the RPM in container"
|
|
@echo " - set BUILD_CONTAINER to select the container"
|
|
- @echo " - available containers are:" el{8..9} f{35..40} rawhide
|
|
+ @echo " - available containers are:" el{8..9} f{41..42} rawhide
|
|
@echo " - this can't be used to build in parallel,"
|
|
@echo " as build containers operate on the same files"
|
|
@echo " clean_containers clean container images used for building"
|
|
@@ -154,7 +154,7 @@ build_container:
|
|
el[8-9]) \
|
|
_CONT_FILE="Containerfile.ubi"$${BUILD_CONTAINER: -1}; \
|
|
;; \
|
|
- f3[5-9]|f40|rawhide) \
|
|
+ f4[1-2]|rawhide) \
|
|
[ $$BUILD_CONTAINER = rawhide ] && VERSION=latest || VERSION=$${BUILD_CONTAINER: -2}; \
|
|
_CONT_FILE=".Containerfile.$${BUILD_CONTAINER}"; \
|
|
cp res/container-builds/Containerfile.fedora_generic res/container-builds/$$_CONT_FILE && \
|
|
@@ -165,7 +165,7 @@ build_container:
|
|
exit 1; \
|
|
;; \
|
|
*) \
|
|
- echo "Available containers are: el{8..9} f{35..40} rawhide"; \
|
|
+ echo "Available containers are: el{8..9} f{41..42} rawhide"; \
|
|
exit 1; \
|
|
;; \
|
|
esac && \
|
|
@@ -234,7 +234,7 @@ test_container_all:
|
|
done
|
|
|
|
clean_containers:
|
|
- @for i in "leapp-build-"{el8,el9,f35,f36,rawhide} "leapp-tests-rhel"{8..10}; do \
|
|
+ @for i in leapp-build-el{8,9} leapp-build-f{41..42} leapp-build-rawhide leapp-tests-rhel{8..10}; do \
|
|
[ -z $$($(_CONTAINER_TOOL) images -q "$$i") ] || \
|
|
$(_CONTAINER_TOOL) rmi "$$i" > /dev/null 2>&1 || :; \
|
|
done
|
|
diff --git a/res/container-builds/Containerfile.fedora_generic b/res/container-builds/Containerfile.fedora_generic
|
|
index c0af2b7..bd67876 100644
|
|
--- a/res/container-builds/Containerfile.fedora_generic
|
|
+++ b/res/container-builds/Containerfile.fedora_generic
|
|
@@ -5,7 +5,7 @@ VOLUME /payload
|
|
ENV DIST_VERSION 8
|
|
|
|
RUN dnf update -y && \
|
|
- dnf install -y python3 make git rpm-build python3-devel
|
|
+ dnf install -y python3 make git rpm-build python3-devel python3-setuptools
|
|
#yum install -y python3-pip && \ python3 -m pip install --upgrade pip==20.3.4
|
|
|
|
WORKDIR /payload
|
|
--
|
|
2.51.1
|
|
|