brammp/LXCMinimalCTs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Fedora, fixed cache script and did some cleanup

Browse Source 
* Added Alpine 3.21 to the jenkinsfile
* Added Debian Trixe(13) to the jenkinsfile
* Fixed broken cache script Alpine edge builds
* Added Fedora (41) distro
* Cleaned-up Debian.yaml
This commit is contained in:
Bram Prieshof
2025-01-07 00:00:15 +01:00
parent 6370816e21
commit 95ed59561b
8 changed files with 255 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Scripts/UpdateIMGBuildFile-CacheAndRepo.sh
View File

@@ -23,6 +23,7 @@ fi
CacheAlpineRepo="http://$UseServer/alpine/"
CacheDebianCache="http://$UseServer:80"
CacheDebianCore="http://$UseServer/deb.debian.org/debian"
CacheFedoraCache="http://$UseServer:80"
#Check if using StatusFlag if not chek if scipt is configured
if [ -n "$StatusFlag" ]; then
@@ -43,11 +44,13 @@ if [ $UseCache = yes ]; then
AlpineRepo=$CacheAlpineRepo
DebianCache='Acquire::http::Proxy "'$CacheDebianCache'";'
DebianCore=$CacheDebianCore
FedoraCache='proxy = "'$CacheFedoraCache'"'
elif [ $UseCache = no ]; then
echo "Not using cache server"
AlpineRepo=$DefaultAlpineRepo
DebianCache='#CacheServer not set'
DebianCore=$DefaultDebianCore
FedoraCache='#CacheServer not set'
fi
#Goto ProjectRoot
@@ -61,7 +64,7 @@ sed -i -e '/#InitDownloadREPO/a \ url: '$DefaultAlpineRepo'' CT-Build/Alpine.ya
#AlpineRepo
sed -i -n '/#StartREPOS/{:a;N;/#EndREPOS/!ba;N;s/.*\n/#HereREPO\n/};p' CT-Build/Alpine.yaml
sed -i -e 's#\#HereREPO#\ \#StartREPOS\n\ '$AlpineRepo'v{{ image.release }}/main\n\ '$AlpineRepo'v{{ image.release }}/community\n\ \#EndREPOS#g' CT-Build/Alpine.yaml
sed -i -e 's#\#HereREPO#\ \#StartREPOS\n\ {% if image.release != "edge" %}\n\ '$AlpineRepo'v{{ image.release }}/main\n\ '$AlpineRepo'v{{ image.release }}/community\n\ {% endif %}\n\ {% if image.release == "edge" %}\n\ '$AlpineRepo'edge/main\n\ '$AlpineRepo'edge/community\n\ \#'$AlpineRepo'edge/testing\n\ {% endif %}\n\ \#EndREPOS#g' CT-Build/Alpine.yaml
#DebianBaseRepo
sed -i -e '/#InitDownloadREPO/{n;d}' CT-Build/Debian.yaml
@@ -70,3 +73,7 @@ sed -i -e '/#InitDownloadREPO/a \ url: '$DebianCore'' CT-Build/Debian.yaml
#DebianProxyCache
sed -i -e '/#ProxyCacheSetting/{n;d}' CT-Build/Debian.yaml
sed -i -e "/#ProxyCacheSetting/a \ echo \'$DebianCache\' > /etc/apt/apt.conf.d/01prox" CT-Build/Debian.yaml
#FedoraProxyCache
sed -i -e '/#ProxyCacheSetting/{n;d}' CT-Build/Fedora.yaml
sed -i -e "/#ProxyCacheSetting/a \ echo \'$FedoraCache\' >> /etc/dnf/dnf.conf" CT-Build/Fedora.yaml