From c4c1af12b214e87e14df2816f933edd6abff43e8 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Mon, 17 Apr 2023 17:33:52 +0200 Subject: [PATCH] create-install*: use overlays to remove config duplication Note 8.2:base is explicitly out of scope (missing rpms) --- README-iso.md | 13 +- configs/8.2.updates/packages.lst | 255 ------------------ configs/{8.2.testing => 8.2}/packages.lst | 0 configs/{8.2.testing => 8.2}/yum.conf.tmpl | 0 configs/{8.2.testing => 8.2}/yumdl.conf.tmpl | 0 configs/8.3.0/yum.conf.tmpl | 17 -- configs/8.3.0/yumdl.conf.tmpl | 3 - configs/8.3.testing/packages.lst | 156 ----------- configs/8.3.testing/yum-repos.conf.tmpl | 20 -- configs/8.3.testing/yum.conf.tmpl | 17 -- configs/8.3.testing/yumdl.conf.tmpl | 3 - configs/8.3.testing/yumdl.flags | 3 - configs/8.3.updates/packages.lst | 156 ----------- configs/8.3.updates/yum-repos.conf.tmpl | 13 - configs/8.3.updates/yum.conf.tmpl | 17 -- configs/8.3.updates/yumdl.conf.tmpl | 3 - configs/8.3.updates/yumdl.flags | 3 - configs/{8.3.0 => 8.3}/packages.lst | 0 configs/{8.2.updates => 8.3}/yum.conf.tmpl | 0 configs/{8.2.updates => 8.3}/yumdl.conf.tmpl | 0 configs/{8.3.0 => base}/yum-repos.conf.tmpl | 0 configs/{8.3.0 => base}/yumdl.flags | 0 .../yum-repos.conf.tmpl | 0 configs/{8.2.testing => testing}/yumdl.flags | 0 .../yum-repos.conf.tmpl | 0 configs/{8.2.updates => updates}/yumdl.flags | 0 installimg/8.2.testing | 1 - .../etc/systemd/system/getty@tty2.service | 0 .../etc/systemd/system/installer.service | 0 installimg/8.3.testing | 1 - installimg/8.3.updates | 1 - .../systemd/system/installer-getty@.service | 0 .../etc/systemd/system/installer.service | 0 iso/8.2.updates/.treeinfo | 34 --- iso/8.2.updates/boot/grub/grub.cfg | 54 ---- iso/8.2.updates/boot/isolinux/pg_help | 15 -- iso/8.2.updates/boot/isolinux/pg_main | 14 - iso/8.2.updates/boot/isolinux/splash.lss | Bin 3341 -> 0 bytes iso/{8.2.testing => 8.2}/.treeinfo | 6 +- .../boot/grub/grub-usb.cfg | 0 iso/{8.2.testing => 8.2}/boot/grub/grub.cfg | 0 .../boot/isolinux/isolinux.cfg | 0 .../boot/isolinux/pg_help | 0 .../boot/isolinux/pg_main | 0 .../boot/isolinux/splash.lss | Bin iso/8.3.0/boot/grub/grub-usb.cfg | 55 ---- iso/8.3.0/boot/isolinux/isolinux.cfg | 29 -- iso/8.3.testing | 1 - iso/8.3.updates | 1 - iso/{8.3.0 => 8.3}/.treeinfo | 6 +- .../boot/grub/grub-usb.cfg | 0 iso/{8.3.0 => 8.3}/boot/grub/grub.cfg | 0 .../boot/isolinux/isolinux.cfg | 0 iso/{8.3.0 => 8.3}/boot/isolinux/pg_help | 0 iso/{8.3.0 => 8.3}/boot/isolinux/pg_main | 0 iso/{8.3.0 => 8.3}/boot/isolinux/splash.lss | Bin iso/{8.3.0 => 8.3}/comps-XS.xml | 0 scripts/create-installimg.sh | 3 +- tests/0100-8.2-updates.t | 6 +- tests/0101-8.2-testing.t | 6 +- tests/0200-8.3-base.t | 6 +- tests/0202-8.3-testing.t | 6 +- 62 files changed, 26 insertions(+), 898 deletions(-) delete mode 100644 configs/8.2.updates/packages.lst rename configs/{8.2.testing => 8.2}/packages.lst (100%) rename configs/{8.2.testing => 8.2}/yum.conf.tmpl (100%) rename configs/{8.2.testing => 8.2}/yumdl.conf.tmpl (100%) delete mode 100644 configs/8.3.0/yum.conf.tmpl delete mode 100644 configs/8.3.0/yumdl.conf.tmpl delete mode 100644 configs/8.3.testing/packages.lst delete mode 100644 configs/8.3.testing/yum-repos.conf.tmpl delete mode 100644 configs/8.3.testing/yum.conf.tmpl delete mode 100644 configs/8.3.testing/yumdl.conf.tmpl delete mode 100644 configs/8.3.testing/yumdl.flags delete mode 100644 configs/8.3.updates/packages.lst delete mode 100644 configs/8.3.updates/yum-repos.conf.tmpl delete mode 100644 configs/8.3.updates/yum.conf.tmpl delete mode 100644 configs/8.3.updates/yumdl.conf.tmpl delete mode 100644 configs/8.3.updates/yumdl.flags rename configs/{8.3.0 => 8.3}/packages.lst (100%) rename configs/{8.2.updates => 8.3}/yum.conf.tmpl (100%) rename configs/{8.2.updates => 8.3}/yumdl.conf.tmpl (100%) rename configs/{8.3.0 => base}/yum-repos.conf.tmpl (100%) rename configs/{8.3.0 => base}/yumdl.flags (100%) rename configs/{8.2.testing => testing}/yum-repos.conf.tmpl (100%) rename configs/{8.2.testing => testing}/yumdl.flags (100%) rename configs/{8.2.updates => updates}/yum-repos.conf.tmpl (100%) rename configs/{8.2.updates => updates}/yumdl.flags (100%) delete mode 120000 installimg/8.2.testing rename installimg/{8.2.updates => 8.2}/etc/systemd/system/getty@tty2.service (100%) rename installimg/{8.2.updates => 8.2}/etc/systemd/system/installer.service (100%) delete mode 120000 installimg/8.3.testing delete mode 120000 installimg/8.3.updates rename installimg/{8.3.0 => 8.3}/etc/systemd/system/installer-getty@.service (100%) rename installimg/{8.3.0 => 8.3}/etc/systemd/system/installer.service (100%) delete mode 100644 iso/8.2.updates/.treeinfo delete mode 100644 iso/8.2.updates/boot/grub/grub.cfg delete mode 100755 iso/8.2.updates/boot/isolinux/pg_help delete mode 100755 iso/8.2.updates/boot/isolinux/pg_main delete mode 100644 iso/8.2.updates/boot/isolinux/splash.lss rename iso/{8.2.testing => 8.2}/.treeinfo (86%) rename iso/{8.2.testing => 8.2}/boot/grub/grub-usb.cfg (100%) rename iso/{8.2.testing => 8.2}/boot/grub/grub.cfg (100%) rename iso/{8.2.testing => 8.2}/boot/isolinux/isolinux.cfg (100%) rename iso/{8.2.testing => 8.2}/boot/isolinux/pg_help (100%) rename iso/{8.2.testing => 8.2}/boot/isolinux/pg_main (100%) rename iso/{8.2.testing => 8.2}/boot/isolinux/splash.lss (100%) delete mode 100644 iso/8.3.0/boot/grub/grub-usb.cfg delete mode 100644 iso/8.3.0/boot/isolinux/isolinux.cfg delete mode 120000 iso/8.3.testing delete mode 120000 iso/8.3.updates rename iso/{8.3.0 => 8.3}/.treeinfo (86%) rename iso/{8.2.updates => 8.3}/boot/grub/grub-usb.cfg (100%) rename iso/{8.3.0 => 8.3}/boot/grub/grub.cfg (100%) rename iso/{8.2.updates => 8.3}/boot/isolinux/isolinux.cfg (100%) rename iso/{8.3.0 => 8.3}/boot/isolinux/pg_help (100%) rename iso/{8.3.0 => 8.3}/boot/isolinux/pg_main (100%) rename iso/{8.3.0 => 8.3}/boot/isolinux/splash.lss (100%) rename iso/{8.3.0 => 8.3}/comps-XS.xml (100%) diff --git a/README-iso.md b/README-iso.md index 11e567d..7b481ed 100644 --- a/README-iso.md +++ b/README-iso.md @@ -32,34 +32,35 @@ Creates `install-$RELEASE.img` for input to `create-install-iso`, from: ## examples -### 8.3.0 +### 8.3 updates and testing ``` ./scripts/mirror-repos.sh 8.3 sudo ./scripts/create-installimg.sh \ --srcurl file://$HOME/mirrors/xcpng/8.3 \ - 8.3.0 + -o install-8.3-testing.img \ + 8.3:testing ./scripts/create-install-iso.sh \ --srcurl file://$HOME/mirrors/xcpng/8.3 \ -V "XCP-NG_830_TEST" \ - 8.3.0 install-8.3.0-x86_64.img xcp-ng-8.3-install.iso + 8.3:testing install-8.3-testing.img xcp-ng-8.3-testing.iso ``` -### latest 8.2 +### tip of 8.2 (8.2 + updates) ``` ./scripts/mirror-repos.sh 8.2 sudo ./scripts/create-installimg.sh \ --srcurl file://$HOME/mirrors/xcpng/8.2 \ - 8.2.updates + 8.2:updates ./scripts/create-install-iso.sh \ --srcurl file://$HOME/mirrors/xcpng/8.2 \ -V "XCP-NG_82U_TEST" \ - 8.2.updates install-8.2.updates-x86_64.img xcp-ng-8.2.updates-install.iso + 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.updates/packages.lst b/configs/8.2.updates/packages.lst deleted file mode 100644 index 5ec7cb9..0000000 --- a/configs/8.2.updates/packages.lst +++ /dev/null @@ -1,255 +0,0 @@ -GeoIP -acl -aic94xx-firmware -audit-libs -avago-megaraid-sas -avago-mpt3sas -basesystem -bash -bind-libs-lite -bind-license -biosdevname -boost-system -boost-thread -bridge-utils -broadcom-bnxt-en -bzip2 -bzip2-libs -ca-certificates -chelsio-cxgb4 -chkconfig -chrony -cisco-enic -cisco-fnic -coreutils -cpio -cracklib -cracklib-dicts -cryptsetup-libs -curl -cyrus-sasl-lib -dbus -dbus-libs -device-mapper -device-mapper-event -device-mapper-event-libs -device-mapper-libs -device-mapper-multipath -device-mapper-multipath-libs -device-mapper-persistent-data -dhclient -dhcp-common -dhcp-libs -diffutils -dmidecode -e2fsprogs -e2fsprogs-libs -edk2 -efibootmgr -efivar-libs -elfutils-default-yama-scope -elfutils-libelf -elfutils-libs -emulex-lpfc -ethtool -expat -fcoe-utils -file-libs -filesystem -findutils -fipscheck -fipscheck-lib -gawk -gdbm -gdisk -glib2 -glibc -glibc-common -gmp -gnupg2 -gpgme -grep -gssproxy -gzip -hardlink -host-installer-startup -hostname -hwdata -info -initscripts -intel-e1000e -intel-fm10k -intel-i40e -intel-ice -intel-igb -intel-ixgbe -iproute -iputils -ipxe -iscsi-initiator-utils -iscsi-initiator-utils-iscsiuio -json-c -kbd -kbd-legacy -kbd-misc -kernel -kernel-alt -keyutils -keyutils-libs -kmod -kmod-libs -kpartx -krb5-libs -libacl -libaio -libassuan -libattr -libbasicobjects -libblkid -libcap -libcap-ng -libcollection -libcom_err -libconfig -libcurl -libdb -libdb-utils -libedit -libempserver -libestr -libevent -libfastjson -libffi -libgcc -libgcrypt -libgpg-error -libicu -libidn -libini_config -libmnl -libmount -libnfsidmap -libnl3 -libpath_utils -libpciaccess -libpwquality -librados2 -libref_array -libreport-filesystem -libseccomp -libselinux -libsemanage -libsepol -libss -libssh2 -libstdc++ -libsysfs -libtasn1 -libtirpc -libuser -libutempter -libuuid -libverto -libverto-libevent -libxml2 -linux-firmware -lldpad -logrotate -lua -lvm2 -lvm2-libs -lz4 -lzo -mdadm -microsemi-smartpqi -ncurses -ncurses-base -ncurses-libs -net-tools -newt -newt-python -nfs-utils -nspr -nss -nss-pem -nss-softokn -nss-softokn-freebl -nss-sysinit -nss-tools -nss-util -openldap -openssh -openssh-clients -openssh-server -openssl-libs -p11-kit -p11-kit-trust -pam -pciutils -pciutils-libs -pcre -pinentry -popt -procps-ng -psmisc -pth -pygpgme -pyliblzma -python -python-iniparse -python-libs -python-pycurl -python-urlgrabber -pyxattr -qlogic-fastlinq -qlogic-netxtreme2-4.19.0+1-modules -qlogic-netxtreme2 -qlogic-qla2xxx -qlogic-qla2xxx-firmware -qrencode-libs -quota -quota-nls -readline -rootfiles -rpcbind -rpm -rpm-build-libs -rpm-libs -rpm-python -rsync -rsyslog -sed -setup -sg3_utils-libs -shadow-utils -shared-mime-info -slang -sqlite -systemd -systemd-libs -systemd-sysv -sysvinit-tools -tar -tcp_wrappers -tcp_wrappers-libs -tzdata -ustr -util-linux -vendor-drivers -vim-minimal -wget -xcp-python-libs -xen-dom0-libs -xen-dom0-tools -xen-installer-files -xen-libs -xen-tools -xcp-ng-release -xcp-ng-release-presets -xz -xz-libs -yajl -yum -yum-metadata-parser -yum-plugin-fastestmirror -zlib diff --git a/configs/8.2.testing/packages.lst b/configs/8.2/packages.lst similarity index 100% rename from configs/8.2.testing/packages.lst rename to configs/8.2/packages.lst diff --git a/configs/8.2.testing/yum.conf.tmpl b/configs/8.2/yum.conf.tmpl similarity index 100% rename from configs/8.2.testing/yum.conf.tmpl rename to configs/8.2/yum.conf.tmpl diff --git a/configs/8.2.testing/yumdl.conf.tmpl b/configs/8.2/yumdl.conf.tmpl similarity index 100% rename from configs/8.2.testing/yumdl.conf.tmpl rename to configs/8.2/yumdl.conf.tmpl diff --git a/configs/8.3.0/yum.conf.tmpl b/configs/8.3.0/yum.conf.tmpl deleted file mode 100644 index d23c5c5..0000000 --- a/configs/8.3.0/yum.conf.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -[main] -keepcache=1 -debuglevel=2 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=1 -assumeyes=1 -syslog_ident=mock -syslog_device= -metadata_expire=0 -mdpolicy=group:primary -best=1 -protected_packages= -skip_missing_names_on_install=0 -tsflags=nodocs diff --git a/configs/8.3.0/yumdl.conf.tmpl b/configs/8.3.0/yumdl.conf.tmpl deleted file mode 100644 index 55e42a2..0000000 --- a/configs/8.3.0/yumdl.conf.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -[main] -plugins=@@ENABLE_PLUGINS@@ -basearch=@@RPMARCH@@ diff --git a/configs/8.3.testing/packages.lst b/configs/8.3.testing/packages.lst deleted file mode 100644 index f942b64..0000000 --- a/configs/8.3.testing/packages.lst +++ /dev/null @@ -1,156 +0,0 @@ -GeoIP -acl -aic94xx-firmware -avago-megaraid-sas -avago-mpt3sas -basesystem -biosdevname -boost-system -boost-thread -bridge-utils -broadcom-bnxt-en -bzip2 -ca-certificates -chelsio-cxgb4 -chkconfig -chrony -cisco-enic -cisco-fnic -coreutils -cpio -cracklib -cracklib-dicts -curl -dbus -device-mapper -device-mapper-event -device-mapper-multipath -device-mapper-persistent-data -dhclient -diffutils -dmidecode -e2fsprogs -edk2 -efibootmgr -efivar-libs -elfutils-default-yama-scope -emulex-lpfc -expat -fcoe-utils -filesystem -findutils -fipscheck -gawk -gdbm -gdisk -gmp -gnupg2 -gpgme -grep -gssproxy -gzip -hardlink -host-installer-startup -hostname -hwdata -info -intel-e1000e -intel-fm10k -intel-i40e -intel-ice -intel-igb -intel-ixgbe -iproute -iputils -ipxe -iscsi-initiator-utils -iscsi-initiator-utils-iscsiuio -json-c -kbd -kbd-legacy -kbd-misc -kernel -kernel-alt -keyutils -kmod -kpartx -linux-firmware -lldpad -logrotate -lua -lvm2 -lz4 -lzo -mdadm -microsemi-smartpqi -ncurses -newt -newt-python -nfs-utils -nspr -nss -nss-pem -nss-softokn -nss-softokn-freebl -nss-sysinit -nss-tools -nss-util -openldap -openssh -openssh-clients -p11-kit -p11-kit-trust -pam -pcre -pinentry -popt -procps-ng -psmisc -pth -pygpgme -python -python-iniparse -python-pycurl -python-urlgrabber -pyxattr -qlogic-fastlinq -qlogic-netxtreme2-4.19.0+1-modules -qlogic-netxtreme2 -qlogic-qla2xxx -qlogic-qla2xxx-firmware -quota -quota-nls -readline -rootfiles -rpcbind -rpm -rpm-python -rsync -rsyslog -sed -setup -shadow-utils -shared-mime-info -slang -sqlite -systemd -systemd-sysv -sysvinit-tools -tar -tcp_wrappers -tzdata -ustr -util-linux -vendor-drivers -vim-minimal -wget -xen-dom0-tools -xen-installer-files -xen-tools -xcp-ng-release -xcp-ng-release-presets -xz -yajl -yum -yum-metadata-parser -yum-plugin-fastestmirror diff --git a/configs/8.3.testing/yum-repos.conf.tmpl b/configs/8.3.testing/yum-repos.conf.tmpl deleted file mode 100644 index f1daf3d..0000000 --- a/configs/8.3.testing/yum-repos.conf.tmpl +++ /dev/null @@ -1,20 +0,0 @@ -[xcpng-base] -name=xcpng-$releasever - Base -baseurl=@@SRCURL@@/base/@@RPMARCH@@/ -gpgkey=https://xcp-ng.org/RPM-GPG-KEY-xcpng -failovermethod=priority -skip_if_unavailable=False - -[xcpng-updates] -name=xcpng-$releasever - Updates -baseurl=@@SRCURL@@/updates/@@RPMARCH@@/ -gpgkey=https://xcp-ng.org/RPM-GPG-KEY-xcpng -failovermethod=priority -skip_if_unavailable=False - -[xcpng-testing] -name=xcpng-$releasever - Testing -baseurl=@@SRCURL@@/testing/@@RPMARCH@@/ -gpgkey=https://xcp-ng.org/RPM-GPG-KEY-xcpng -failovermethod=priority -skip_if_unavailable=False diff --git a/configs/8.3.testing/yum.conf.tmpl b/configs/8.3.testing/yum.conf.tmpl deleted file mode 100644 index d23c5c5..0000000 --- a/configs/8.3.testing/yum.conf.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -[main] -keepcache=1 -debuglevel=2 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=1 -assumeyes=1 -syslog_ident=mock -syslog_device= -metadata_expire=0 -mdpolicy=group:primary -best=1 -protected_packages= -skip_missing_names_on_install=0 -tsflags=nodocs diff --git a/configs/8.3.testing/yumdl.conf.tmpl b/configs/8.3.testing/yumdl.conf.tmpl deleted file mode 100644 index 55e42a2..0000000 --- a/configs/8.3.testing/yumdl.conf.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -[main] -plugins=@@ENABLE_PLUGINS@@ -basearch=@@RPMARCH@@ diff --git a/configs/8.3.testing/yumdl.flags b/configs/8.3.testing/yumdl.flags deleted file mode 100644 index 8b2495d..0000000 --- a/configs/8.3.testing/yumdl.flags +++ /dev/null @@ -1,3 +0,0 @@ -YUMFLAGS+=( - --enablerepo='xcpng-base,xcpng-updates,xcpng-testing' -) diff --git a/configs/8.3.updates/packages.lst b/configs/8.3.updates/packages.lst deleted file mode 100644 index f942b64..0000000 --- a/configs/8.3.updates/packages.lst +++ /dev/null @@ -1,156 +0,0 @@ -GeoIP -acl -aic94xx-firmware -avago-megaraid-sas -avago-mpt3sas -basesystem -biosdevname -boost-system -boost-thread -bridge-utils -broadcom-bnxt-en -bzip2 -ca-certificates -chelsio-cxgb4 -chkconfig -chrony -cisco-enic -cisco-fnic -coreutils -cpio -cracklib -cracklib-dicts -curl -dbus -device-mapper -device-mapper-event -device-mapper-multipath -device-mapper-persistent-data -dhclient -diffutils -dmidecode -e2fsprogs -edk2 -efibootmgr -efivar-libs -elfutils-default-yama-scope -emulex-lpfc -expat -fcoe-utils -filesystem -findutils -fipscheck -gawk -gdbm -gdisk -gmp -gnupg2 -gpgme -grep -gssproxy -gzip -hardlink -host-installer-startup -hostname -hwdata -info -intel-e1000e -intel-fm10k -intel-i40e -intel-ice -intel-igb -intel-ixgbe -iproute -iputils -ipxe -iscsi-initiator-utils -iscsi-initiator-utils-iscsiuio -json-c -kbd -kbd-legacy -kbd-misc -kernel -kernel-alt -keyutils -kmod -kpartx -linux-firmware -lldpad -logrotate -lua -lvm2 -lz4 -lzo -mdadm -microsemi-smartpqi -ncurses -newt -newt-python -nfs-utils -nspr -nss -nss-pem -nss-softokn -nss-softokn-freebl -nss-sysinit -nss-tools -nss-util -openldap -openssh -openssh-clients -p11-kit -p11-kit-trust -pam -pcre -pinentry -popt -procps-ng -psmisc -pth -pygpgme -python -python-iniparse -python-pycurl -python-urlgrabber -pyxattr -qlogic-fastlinq -qlogic-netxtreme2-4.19.0+1-modules -qlogic-netxtreme2 -qlogic-qla2xxx -qlogic-qla2xxx-firmware -quota -quota-nls -readline -rootfiles -rpcbind -rpm -rpm-python -rsync -rsyslog -sed -setup -shadow-utils -shared-mime-info -slang -sqlite -systemd -systemd-sysv -sysvinit-tools -tar -tcp_wrappers -tzdata -ustr -util-linux -vendor-drivers -vim-minimal -wget -xen-dom0-tools -xen-installer-files -xen-tools -xcp-ng-release -xcp-ng-release-presets -xz -yajl -yum -yum-metadata-parser -yum-plugin-fastestmirror diff --git a/configs/8.3.updates/yum-repos.conf.tmpl b/configs/8.3.updates/yum-repos.conf.tmpl deleted file mode 100644 index cd9f085..0000000 --- a/configs/8.3.updates/yum-repos.conf.tmpl +++ /dev/null @@ -1,13 +0,0 @@ -[xcpng-base] -name=xcpng-$releasever - Base -baseurl=@@SRCURL@@/base/@@RPMARCH@@/ -gpgkey=https://xcp-ng.org/RPM-GPG-KEY-xcpng -failovermethod=priority -skip_if_unavailable=False - -[xcpng-updates] -name=xcpng-$releasever - Updates -baseurl=@@SRCURL@@/updates/@@RPMARCH@@/ -gpgkey=https://xcp-ng.org/RPM-GPG-KEY-xcpng -failovermethod=priority -skip_if_unavailable=False diff --git a/configs/8.3.updates/yum.conf.tmpl b/configs/8.3.updates/yum.conf.tmpl deleted file mode 100644 index d23c5c5..0000000 --- a/configs/8.3.updates/yum.conf.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -[main] -keepcache=1 -debuglevel=2 -reposdir=/dev/null -logfile=/var/log/yum.log -retries=20 -obsoletes=1 -gpgcheck=1 -assumeyes=1 -syslog_ident=mock -syslog_device= -metadata_expire=0 -mdpolicy=group:primary -best=1 -protected_packages= -skip_missing_names_on_install=0 -tsflags=nodocs diff --git a/configs/8.3.updates/yumdl.conf.tmpl b/configs/8.3.updates/yumdl.conf.tmpl deleted file mode 100644 index 55e42a2..0000000 --- a/configs/8.3.updates/yumdl.conf.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -[main] -plugins=@@ENABLE_PLUGINS@@ -basearch=@@RPMARCH@@ diff --git a/configs/8.3.updates/yumdl.flags b/configs/8.3.updates/yumdl.flags deleted file mode 100644 index 552a3b8..0000000 --- a/configs/8.3.updates/yumdl.flags +++ /dev/null @@ -1,3 +0,0 @@ -YUMFLAGS+=( - --enablerepo='xcpng-base,xcpng-updates' -) diff --git a/configs/8.3.0/packages.lst b/configs/8.3/packages.lst similarity index 100% rename from configs/8.3.0/packages.lst rename to configs/8.3/packages.lst diff --git a/configs/8.2.updates/yum.conf.tmpl b/configs/8.3/yum.conf.tmpl similarity index 100% rename from configs/8.2.updates/yum.conf.tmpl rename to configs/8.3/yum.conf.tmpl diff --git a/configs/8.2.updates/yumdl.conf.tmpl b/configs/8.3/yumdl.conf.tmpl similarity index 100% rename from configs/8.2.updates/yumdl.conf.tmpl rename to configs/8.3/yumdl.conf.tmpl diff --git a/configs/8.3.0/yum-repos.conf.tmpl b/configs/base/yum-repos.conf.tmpl similarity index 100% rename from configs/8.3.0/yum-repos.conf.tmpl rename to configs/base/yum-repos.conf.tmpl diff --git a/configs/8.3.0/yumdl.flags b/configs/base/yumdl.flags similarity index 100% rename from configs/8.3.0/yumdl.flags rename to configs/base/yumdl.flags diff --git a/configs/8.2.testing/yum-repos.conf.tmpl b/configs/testing/yum-repos.conf.tmpl similarity index 100% rename from configs/8.2.testing/yum-repos.conf.tmpl rename to configs/testing/yum-repos.conf.tmpl diff --git a/configs/8.2.testing/yumdl.flags b/configs/testing/yumdl.flags similarity index 100% rename from configs/8.2.testing/yumdl.flags rename to configs/testing/yumdl.flags diff --git a/configs/8.2.updates/yum-repos.conf.tmpl b/configs/updates/yum-repos.conf.tmpl similarity index 100% rename from configs/8.2.updates/yum-repos.conf.tmpl rename to configs/updates/yum-repos.conf.tmpl diff --git a/configs/8.2.updates/yumdl.flags b/configs/updates/yumdl.flags similarity index 100% rename from configs/8.2.updates/yumdl.flags rename to configs/updates/yumdl.flags diff --git a/installimg/8.2.testing b/installimg/8.2.testing deleted file mode 120000 index 8b17d29..0000000 --- a/installimg/8.2.testing +++ /dev/null @@ -1 +0,0 @@ -8.2.updates \ No newline at end of file diff --git a/installimg/8.2.updates/etc/systemd/system/getty@tty2.service b/installimg/8.2/etc/systemd/system/getty@tty2.service similarity index 100% rename from installimg/8.2.updates/etc/systemd/system/getty@tty2.service rename to installimg/8.2/etc/systemd/system/getty@tty2.service diff --git a/installimg/8.2.updates/etc/systemd/system/installer.service b/installimg/8.2/etc/systemd/system/installer.service similarity index 100% rename from installimg/8.2.updates/etc/systemd/system/installer.service rename to installimg/8.2/etc/systemd/system/installer.service diff --git a/installimg/8.3.testing b/installimg/8.3.testing deleted file mode 120000 index 9f4a0fb..0000000 --- a/installimg/8.3.testing +++ /dev/null @@ -1 +0,0 @@ -8.3.0 \ No newline at end of file diff --git a/installimg/8.3.updates b/installimg/8.3.updates deleted file mode 120000 index 9f4a0fb..0000000 --- a/installimg/8.3.updates +++ /dev/null @@ -1 +0,0 @@ -8.3.0 \ No newline at end of file diff --git a/installimg/8.3.0/etc/systemd/system/installer-getty@.service b/installimg/8.3/etc/systemd/system/installer-getty@.service similarity index 100% rename from installimg/8.3.0/etc/systemd/system/installer-getty@.service rename to installimg/8.3/etc/systemd/system/installer-getty@.service diff --git a/installimg/8.3.0/etc/systemd/system/installer.service b/installimg/8.3/etc/systemd/system/installer.service similarity index 100% rename from installimg/8.3.0/etc/systemd/system/installer.service rename to installimg/8.3/etc/systemd/system/installer.service diff --git a/iso/8.2.updates/.treeinfo b/iso/8.2.updates/.treeinfo deleted file mode 100644 index b3194be..0000000 --- a/iso/8.2.updates/.treeinfo +++ /dev/null @@ -1,34 +0,0 @@ -[platform] -name = XCP -version = 3.2.1 - -[branding] -name = XCP-ng -version = 8.2.updates - -[build] -#number = release/yangtze/master/58 - -[keys] -key1 = RPM-GPG-KEY-CH-8 -key2 = RPM-GPG-KEY-CH-8-LCM -key3 = RPM-GPG-KEY-Platform-V1 - -[general] -name = XCP-ng-8.2.updates -family = XCP-ng -timestamp = {{timestamp}} -variant = -version = 8.2.updates -packagedir = -arch = x86_64 - -[images-x86_64] -kernel = boot/pxelinux/mboot.c32 -initrd = boot/vmlinuz -boot.iso = boot/xen.gz - -[images-xen] -kernel = boot/pxelinux/mboot.c32 -initrd = boot/vmlinuz - diff --git a/iso/8.2.updates/boot/grub/grub.cfg b/iso/8.2.updates/boot/grub/grub.cfg deleted file mode 100644 index 656f9ed..0000000 --- a/iso/8.2.updates/boot/grub/grub.cfg +++ /dev/null @@ -1,54 +0,0 @@ -set default="0" - -function load_video { - insmod efi_gop - insmod efi_uga - insmod video_bochs - insmod video_cirrus - insmod all_video -} - -load_video -set gfxpayload=keep -insmod gzio -insmod part_gpt -insmod ext2 - -set timeout=5 - -menuentry "install" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga - module2 /boot/vmlinuz console=hvc0 console=tty0 - module2 /install.img -} - -menuentry "install with alternate kernel (kernel-alt)" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga - module2 /boot/alt/vmlinuz console=hvc0 console=tty0 kernel-alt - module2 /install.img -} - -menuentry "no-serial" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M console=vga - module2 /boot/vmlinuz console=tty0 - module2 /install.img -} - -menuentry "safe" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M nosmp noreboot noirqbalance no-mce no-bootscrub no-numa no-hap no-mmcfg max_cstate=0 nmi=ignore allow_unsafe com1=115200,8n1 console=com1,vga vga=keep - module2 /boot/vmlinuz console=hvc0 console=tty0 - module2 /install.img -} - -menuentry "multipath" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga - module2 /boot/vmlinuz console=hvc0 console=tty0 device_mapper_multipath=enabled - module2 /install.img -} - -menuentry "shell" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga - module2 /boot/vmlinuz console=hvc0 console=tty0 bash-shell - module2 /install.img -} - diff --git a/iso/8.2.updates/boot/isolinux/pg_help b/iso/8.2.updates/boot/isolinux/pg_help deleted file mode 100755 index 61dcf41..0000000 --- a/iso/8.2.updates/boot/isolinux/pg_help +++ /dev/null @@ -1,15 +0,0 @@ - -splash.lss - -05Welcome to XCP-ng. - - - To install or upgrade press the 0e05 key. - - To install or upgrade using our alternate kernel, type 0einstall-alt 05. - - To install or upgrade without a serial console, type 0eno-serial 05. - - To install or upgrade in safe mode, type 0esafe 05. - - To install or upgrade to a multipathed root disk, type 0emultipath 05. - - To boot into a shell prompt, type 0eshell 05. - - To perform a memory test, type 0ememtest 05. - - To open a boot menu and/or edit boot entries, type 0emenu 05. - -0f[F1-Standard] [F2-Advanced]05 diff --git a/iso/8.2.updates/boot/isolinux/pg_main b/iso/8.2.updates/boot/isolinux/pg_main deleted file mode 100755 index b16c762..0000000 --- a/iso/8.2.updates/boot/isolinux/pg_main +++ /dev/null @@ -1,14 +0,0 @@ - -splash.lss - -05Welcome to XCP-ng. - - - To install or upgrade press the 0e05 key. - (Press F2 for other options) - - - - - - -0f[F1-Standard] [F2-Advanced]05 diff --git a/iso/8.2.updates/boot/isolinux/splash.lss b/iso/8.2.updates/boot/isolinux/splash.lss deleted file mode 100644 index f615543b76d8272a1246a1032543e3929de27cff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3341 zcmeHJ{ZCuh89vAMB__^I&hZB}pi0*m=xEjLn$V9>MRD+5pq(aNQ<9RV)gVRps>>#^ z;J`i<$tEFXUD90>Jduz|RBNKm%?~Citu3!=D{WJ@F^OnOM24ac ze=^qHv-itSKDlq-6TQ8?2M!#lZN0noE|dQM_XSJAW?|p#LKm)8q4=>1&BGnE%rlXN zW*pZDentwz5vp=o1&HI4z|_JpRrokjG7B}Gy#^=_@wcJFnQZSbfHi2B&SC2_Sc~l$*QZbjBqNGa6P+qn{_tb7p3>g=-Bfj;@zs9Lynzeb0OAyuWYA!(8*vLPRmXmNu`M zo?G7nA;k4+;P0?<4)zuE+SKvi^wZ+%oOE!Edn*p*2((QY((CRQpF)0W;EJ8HZ|HgW`3+OmBTH;KTr8MW%2Z6xX-*R@JnvJo@F!^ zXrzmSEqx;#~JdzLcCgp5QN<*900UxRrPY+=|&WmE?57 zcp7Rxs5r&kM zk!?E3+lN`@oz@tmy9i%@Wcl_l8t`S%x_2O#3lx$5%FR&$I>taPbsU@VayOK=@g z2z7bgPBBJ(xzgpXfu02Kn-5a&wiswS#7bAX1`@nSd%}r*TM87fUOFH9A@9^4;>v&P zqa;&$Aw&72TJL8h*9*$lOD`}M?+f<59-^LYTg+C;p6qMnjd}ZODaH-PNDf157{>np2sCj3x_17XqQ@01~i_l>Ehbw;EC4{ zZq*WF&8@SLj$4ft?G)0(JVlrD8Mg6<#je?cJ%Vd!tJn1z6xA;;-LS_kMiV)=H7?RS zajq%!KqaB~~#EJQ|@#jvY54K@$i)7@D)19Dj6DR7If zK0*q%Qh=+8`dBzeGPaTdf6g75&w_z$Gl)_1G8l-b^ zn=zC0+NQ9#D6u=TfA;oIfkhzvFJM=M${kf3b32S#c^}XP0U=P8;@k@0RWfa>c}9ae z4jz2pKt0GoXkh~J;=@xkZL>TH(_I4c;lq?*ZWfCwv8l(L_a@WqjqFq~!0(yBg6rGdPO`y=TQpuxKw~qab_% z01>;!rX^_Yqvi=MmRb|DABif6S1o_Z=7C?u_PIc2oVvJ zj_roi6wiDWOOBp#Rvb%+h_xreJr*DQ+}^WUXr3MFn7t?#A!j*)%`e#U_rD&|zX9;B B!^Qvr diff --git a/iso/8.2.testing/.treeinfo b/iso/8.2/.treeinfo similarity index 86% rename from iso/8.2.testing/.treeinfo rename to iso/8.2/.treeinfo index 1634060..d6719e4 100644 --- a/iso/8.2.testing/.treeinfo +++ b/iso/8.2/.treeinfo @@ -4,7 +4,7 @@ version = 3.2.1 [branding] name = XCP-ng -version = 8.2.testing +version = 8.2 [build] #number = release/yangtze/master/58 @@ -15,11 +15,11 @@ key2 = RPM-GPG-KEY-CH-8-LCM key3 = RPM-GPG-KEY-Platform-V1 [general] -name = XCP-ng-8.2.testing +name = XCP-ng-8.2 family = XCP-ng timestamp = {{timestamp}} variant = -version = 8.2.testing +version = 8.2 packagedir = arch = x86_64 diff --git a/iso/8.2.testing/boot/grub/grub-usb.cfg b/iso/8.2/boot/grub/grub-usb.cfg similarity index 100% rename from iso/8.2.testing/boot/grub/grub-usb.cfg rename to iso/8.2/boot/grub/grub-usb.cfg diff --git a/iso/8.2.testing/boot/grub/grub.cfg b/iso/8.2/boot/grub/grub.cfg similarity index 100% rename from iso/8.2.testing/boot/grub/grub.cfg rename to iso/8.2/boot/grub/grub.cfg diff --git a/iso/8.2.testing/boot/isolinux/isolinux.cfg b/iso/8.2/boot/isolinux/isolinux.cfg similarity index 100% rename from iso/8.2.testing/boot/isolinux/isolinux.cfg rename to iso/8.2/boot/isolinux/isolinux.cfg diff --git a/iso/8.2.testing/boot/isolinux/pg_help b/iso/8.2/boot/isolinux/pg_help similarity index 100% rename from iso/8.2.testing/boot/isolinux/pg_help rename to iso/8.2/boot/isolinux/pg_help diff --git a/iso/8.2.testing/boot/isolinux/pg_main b/iso/8.2/boot/isolinux/pg_main similarity index 100% rename from iso/8.2.testing/boot/isolinux/pg_main rename to iso/8.2/boot/isolinux/pg_main diff --git a/iso/8.2.testing/boot/isolinux/splash.lss b/iso/8.2/boot/isolinux/splash.lss similarity index 100% rename from iso/8.2.testing/boot/isolinux/splash.lss rename to iso/8.2/boot/isolinux/splash.lss diff --git a/iso/8.3.0/boot/grub/grub-usb.cfg b/iso/8.3.0/boot/grub/grub-usb.cfg deleted file mode 100644 index 6d74b1e..0000000 --- a/iso/8.3.0/boot/grub/grub-usb.cfg +++ /dev/null @@ -1,55 +0,0 @@ -set default="0" - -function load_video { - insmod efi_gop - insmod efi_uga - insmod video_bochs - insmod video_cirrus - insmod all_video -} - -load_video -set gfxpayload=keep -insmod gzio -insmod part_gpt -insmod ext2 - -set timeout=5 -search --file --set /install.img - -menuentry "install" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga - module2 /boot/vmlinuz console=hvc0 console=tty0 - module2 /install.img -} - -menuentry "install with alternate kernel (kernel-alt)" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga - module2 /boot/alt/vmlinuz console=hvc0 console=tty0 kernel-alt - module2 /install.img -} - -menuentry "no-serial" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M console=vga - module2 /boot/vmlinuz console=tty0 - module2 /install.img -} - -menuentry "safe" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M nosmp noreboot noirqbalance no-mce no-bootscrub no-numa no-hap no-mmcfg max_cstate=0 nmi=ignore allow_unsafe com1=115200,8n1 console=com1,vga vga=keep - module2 /boot/vmlinuz console=hvc0 console=tty0 - module2 /install.img -} - -menuentry "multipath" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga - module2 /boot/vmlinuz console=hvc0 console=tty0 device_mapper_multipath=enabled - module2 /install.img -} - -menuentry "shell" { - multiboot2 /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga - module2 /boot/vmlinuz console=hvc0 console=tty0 bash-shell - module2 /install.img -} - diff --git a/iso/8.3.0/boot/isolinux/isolinux.cfg b/iso/8.3.0/boot/isolinux/isolinux.cfg deleted file mode 100644 index 23468c3..0000000 --- a/iso/8.3.0/boot/isolinux/isolinux.cfg +++ /dev/null @@ -1,29 +0,0 @@ -SERIAL 0 115200 -DEFAULT install -PROMPT 1 -TIMEOUT 50 -DISPLAY pg_main -F1 pg_main -F2 pg_help - -LABEL install - KERNEL mboot.c32 - APPEND /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga --- /boot/vmlinuz console=hvc0 console=tty0 --- /install.img -LABEL install-alt - KERNEL mboot.c32 - APPEND /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga --- /boot/alt/vmlinuz console=hvc0 console=tty0 kernel-alt --- /install.img -LABEL no-serial - KERNEL mboot.c32 - APPEND /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M console=vga --- /boot/vmlinuz console=tty0 --- /install.img -LABEL safe - KERNEL mboot.c32 - APPEND /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M nosmp noreboot noirqbalance no-mce no-bootscrub no-numa no-hap no-mmcfg max_cstate=0 nmi=ignore allow_unsafe com1=115200,8n1 console=com1,vga vga=keep --- /boot/vmlinuz console=hvc0 console=tty0 --- /install.img -LABEL multipath - KERNEL mboot.c32 - APPEND /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga --- /boot/vmlinuz console=hvc0 console=tty0 device_mapper_multipath=enabled --- /install.img -LABEL shell - KERNEL mboot.c32 - APPEND /boot/xen.gz dom0_max_vcpus=1-16 dom0_mem=max:8192M com1=115200,8n1 console=com1,vga --- /boot/vmlinuz console=hvc0 console=tty0 bash-shell --- /install.img - -LABEL memtest - LINUX /boot/memtest.bin diff --git a/iso/8.3.testing b/iso/8.3.testing deleted file mode 120000 index 9f4a0fb..0000000 --- a/iso/8.3.testing +++ /dev/null @@ -1 +0,0 @@ -8.3.0 \ No newline at end of file diff --git a/iso/8.3.updates b/iso/8.3.updates deleted file mode 120000 index 9f4a0fb..0000000 --- a/iso/8.3.updates +++ /dev/null @@ -1 +0,0 @@ -8.3.0 \ No newline at end of file diff --git a/iso/8.3.0/.treeinfo b/iso/8.3/.treeinfo similarity index 86% rename from iso/8.3.0/.treeinfo rename to iso/8.3/.treeinfo index e81050e..c9a077b 100644 --- a/iso/8.3.0/.treeinfo +++ b/iso/8.3/.treeinfo @@ -2,7 +2,7 @@ platform_name = XCP platform_version = 3.3.0 product_name = XCP-ng -product_version = 8.3.0 +product_version = 8.3 [build] number = cloud @@ -10,11 +10,11 @@ number = cloud key1 = RPM-GPG-KEY-xcpng [general] -name = XCP-ng-8.3.0 +name = XCP-ng-8.3 family = XCP-ng timestamp = {{timestamp}} variant = -version = 8.3.0 +version = 8.3 packagedir = arch = x86_64 diff --git a/iso/8.2.updates/boot/grub/grub-usb.cfg b/iso/8.3/boot/grub/grub-usb.cfg similarity index 100% rename from iso/8.2.updates/boot/grub/grub-usb.cfg rename to iso/8.3/boot/grub/grub-usb.cfg diff --git a/iso/8.3.0/boot/grub/grub.cfg b/iso/8.3/boot/grub/grub.cfg similarity index 100% rename from iso/8.3.0/boot/grub/grub.cfg rename to iso/8.3/boot/grub/grub.cfg diff --git a/iso/8.2.updates/boot/isolinux/isolinux.cfg b/iso/8.3/boot/isolinux/isolinux.cfg similarity index 100% rename from iso/8.2.updates/boot/isolinux/isolinux.cfg rename to iso/8.3/boot/isolinux/isolinux.cfg diff --git a/iso/8.3.0/boot/isolinux/pg_help b/iso/8.3/boot/isolinux/pg_help similarity index 100% rename from iso/8.3.0/boot/isolinux/pg_help rename to iso/8.3/boot/isolinux/pg_help diff --git a/iso/8.3.0/boot/isolinux/pg_main b/iso/8.3/boot/isolinux/pg_main similarity index 100% rename from iso/8.3.0/boot/isolinux/pg_main rename to iso/8.3/boot/isolinux/pg_main diff --git a/iso/8.3.0/boot/isolinux/splash.lss b/iso/8.3/boot/isolinux/splash.lss similarity index 100% rename from iso/8.3.0/boot/isolinux/splash.lss rename to iso/8.3/boot/isolinux/splash.lss diff --git a/iso/8.3.0/comps-XS.xml b/iso/8.3/comps-XS.xml similarity index 100% rename from iso/8.3.0/comps-XS.xml rename to iso/8.3/comps-XS.xml diff --git a/scripts/create-installimg.sh b/scripts/create-installimg.sh index bd0dc2d..705f660 100755 --- a/scripts/create-installimg.sh +++ b/scripts/create-installimg.sh @@ -153,8 +153,7 @@ ln -s ../../../usr/lib/python2.7/site-packages/xcp/branding.py \ ### services case "$DIST" in - 8.2.*) - # FIXME do we really want to stick to 8.2.1 here? + 8.2) INSTALLERGETTY=getty@tty2.service ;; *) diff --git a/tests/0100-8.2-updates.t b/tests/0100-8.2-updates.t index 2b8b5c5..6e215ae 100755 --- a/tests/0100-8.2-updates.t +++ b/tests/0100-8.2-updates.t @@ -22,14 +22,14 @@ test_expect_success "build image for 8.2:updates" "sudo sh -c ' $TOPDIR/scripts/create-installimg.sh \ --srcurl $XCPTEST_REPOROOT/8.2 \ - 8.2.updates && + 8.2:updates && - test -r install-8.2.updates-x86_64.img && + test -r install-8.2-x86_64.img && $TOPDIR/scripts/create-install-iso.sh \ --srcurl $XCPTEST_REPOROOT/8.2 \ -V 'XCP-NG_TEST' \ - 8.2.updates install-8.2.updates-x86_64.img xcp-ng-8.2-install.iso && + 8.2:updates install-8.2-x86_64.img xcp-ng-8.2-install.iso && test -r xcp-ng-8.2-install.iso '" diff --git a/tests/0101-8.2-testing.t b/tests/0101-8.2-testing.t index a880146..8197371 100755 --- a/tests/0101-8.2-testing.t +++ b/tests/0101-8.2-testing.t @@ -22,14 +22,14 @@ test_expect_success "build image for 8.2:testing" "sudo sh -c ' $TOPDIR/scripts/create-installimg.sh \ --srcurl $XCPTEST_REPOROOT/8.2 \ - 8.2.testing && + 8.2:testing && - test -r install-8.2.testing-x86_64.img && + test -r install-8.2-x86_64.img && $TOPDIR/scripts/create-install-iso.sh \ --srcurl $XCPTEST_REPOROOT/8.2 \ -V 'XCP-NG_TEST' \ - 8.2.testing install-8.2.testing-x86_64.img xcp-ng-8.2-install.iso && + 8.2:testing install-8.2-x86_64.img xcp-ng-8.2-install.iso && test -r xcp-ng-8.2-install.iso '" diff --git a/tests/0200-8.3-base.t b/tests/0200-8.3-base.t index 6b81736..bcbb74a 100755 --- a/tests/0200-8.3-base.t +++ b/tests/0200-8.3-base.t @@ -22,14 +22,14 @@ test_expect_success "build image for 8.3:base" "sudo sh -c ' $TOPDIR/scripts/create-installimg.sh \ --srcurl $XCPTEST_REPOROOT/8.3 \ - 8.3.0 && + 8.3:base && - test -r install-8.3.0-x86_64.img && + test -r install-8.3-x86_64.img && $TOPDIR/scripts/create-install-iso.sh \ --srcurl $XCPTEST_REPOROOT/8.3 \ -V 'XCP-NG_TEST' \ - 8.3.0 install-8.3.0-x86_64.img xcp-ng-8.3-install.iso && + 8.3:base install-8.3-x86_64.img xcp-ng-8.3-install.iso && test -r xcp-ng-8.3-install.iso '" diff --git a/tests/0202-8.3-testing.t b/tests/0202-8.3-testing.t index 1ac4002..2bb3c0e 100755 --- a/tests/0202-8.3-testing.t +++ b/tests/0202-8.3-testing.t @@ -22,14 +22,14 @@ test_expect_success "build image for 8.3:testing" "sudo sh -c ' $TOPDIR/scripts/create-installimg.sh \ --srcurl $XCPTEST_REPOROOT/8.3 \ - 8.3.testing && + 8.3:testing && - test -r install-8.3.testing-x86_64.img && + test -r install-8.3-x86_64.img && $TOPDIR/scripts/create-install-iso.sh \ --srcurl $XCPTEST_REPOROOT/8.3 \ -V 'XCP-NG_TEST' \ - 8.3.testing install-8.3.testing-x86_64.img xcp-ng-8.3-install.iso && + 8.3:testing install-8.3-x86_64.img xcp-ng-8.3-install.iso && test -r xcp-ng-8.3-install.iso '"