create-install-iso: use config files for yumdownloader

Shares repo definition with create-installimg, as allowed by the switch away from Mock.
xcp-ng · Apr 18, 2023 · 03ce297 · 03ce297
1 parent 8f719ff
commit 03ce297
Show file tree

Hide file tree

Showing 13 changed files with 42 additions and 22 deletions.
diff --git a/README-iso.md b/README-iso.md
@@ -58,8 +58,8 @@ sudo ./scripts/create-installimg.sh \
 
 ./scripts/create-install-iso.sh \
     --srcurl file://$HOME/mirrors/xcpng/8.2 \
-    -V "XCP-NG_821_TEST" \
-    8.2.1 install-8.2.updates-x86_64.img xcp-ng-8.2.1-install.iso
+    -V "XCP-NG_82U_TEST" \
+    8.2.updates install-8.2.updates-x86_64.img xcp-ng-8.2.updates-install.iso
 ```
 
 ### testing boot modes in qemu

diff --git a/configs/8.2.testing/yumdl.conf.tmpl b/configs/8.2.testing/yumdl.conf.tmpl
@@ -0,0 +1,3 @@
+[main]
+plugins=@@ENABLE_PLUGINS@@
+basearch=@@RPMARCH@@
diff --git a/configs/8.2.testing/yumdl.flags b/configs/8.2.testing/yumdl.flags
@@ -0,0 +1,3 @@
+YUMFLAGS+=(
+        --enablerepo='xcpng-base,xcpng-updates,xcpng-testing'
+)
diff --git a/configs/8.2.updates/yumdl.conf.tmpl b/configs/8.2.updates/yumdl.conf.tmpl
@@ -0,0 +1,3 @@
+[main]
+plugins=@@ENABLE_PLUGINS@@
+basearch=@@RPMARCH@@
diff --git a/configs/8.2.updates/yumdl.flags b/configs/8.2.updates/yumdl.flags
@@ -0,0 +1,3 @@
+YUMFLAGS+=(
+        --enablerepo='xcpng-base,xcpng-updates'
+)
diff --git a/configs/8.3.0/yumdl.conf.tmpl b/configs/8.3.0/yumdl.conf.tmpl
@@ -0,0 +1,3 @@
+[main]
+plugins=@@ENABLE_PLUGINS@@
+basearch=@@RPMARCH@@
diff --git a/configs/8.3.0/yumdl.flags b/configs/8.3.0/yumdl.flags
@@ -0,0 +1,3 @@
+YUMFLAGS+=(
+        --enablerepo='xcpng-base'
+)
diff --git a/configs/8.3.testing/yumdl.conf.tmpl b/configs/8.3.testing/yumdl.conf.tmpl
@@ -0,0 +1,3 @@
+[main]
+plugins=@@ENABLE_PLUGINS@@
+basearch=@@RPMARCH@@
diff --git a/configs/8.3.testing/yumdl.flags b/configs/8.3.testing/yumdl.flags
@@ -0,0 +1,3 @@
+YUMFLAGS+=(
+        --enablerepo='xcpng-base,xcpng-updates,xcpng-testing'
+)
diff --git a/configs/8.3.updates/yumdl.conf.tmpl b/configs/8.3.updates/yumdl.conf.tmpl
@@ -0,0 +1,3 @@
+[main]
+plugins=@@ENABLE_PLUGINS@@
+basearch=@@RPMARCH@@
diff --git a/configs/8.3.updates/yumdl.flags b/configs/8.3.updates/yumdl.flags
@@ -0,0 +1,3 @@
+YUMFLAGS+=(
+        --enablerepo='xcpng-base,xcpng-updates'
+)
diff --git a/iso/8.3.updates b/iso/8.3.updates
@@ -0,0 +1 @@
+8.3.0
diff --git a/scripts/lib/misc.sh b/scripts/lib/misc.sh
@@ -98,33 +98,22 @@ setup_yum_download() {
         enable_plugins=0
     fi
 
-    # FIXME gpgcheck
-    cat > "$YUMCONF" <<EOF
-[main]
-gpgcheck=0
-repo_gpgcheck=0
-plugins=${enable_plugins}
-basearch=$RPMARCH
-[xcpng-base]
-name=xcpng-base
-baseurl=$SRCURL/base/$RPMARCH/
-[xcpng-updates]
-name=xcpng-updates
-baseurl=$SRCURL/updates/$RPMARCH/
-[xcpng-testing]
-name=xcpng-testing
-baseurl=$SRCURL/testing/$RPMARCH/
-EOF
+    confdir="$topdir/configs/$DIST"
+    cat "$confdir/yumdl.conf.tmpl" "$confdir/yum-repos.conf.tmpl" |
+        sed \
+            -e "s,@@SRCURL@@,$SRCURL," \
+            -e "s,@@RPMARCH@@,$RPMARCH," \
+            -e "s,@@ENABLE_PLUGINS@@,$enable_plugins," \
+            > "$YUMCONF"
     mkdir ${VERBOSE} "$DUMMYROOT/etc"
     YUMFLAGS=(
          ${VERBOSE}
          --config="$YUMCONF"
          --releasever="$DIST"
          --disablerepo="*"
          --installroot="$DUMMYROOT"
-         #--enablerepo='xcpng-base'
-         --enablerepo='xcpng-base,xcpng-updates,xcpng-testing'
-        )
+    )
+    . "$confdir/yumdl.flags"
 }
 
 get_rpms() {