Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
create-install*: use overlays to remove config duplication
Browse files Browse the repository at this point in the history
Note 8.2:base is explicitly out of scope (missing rpms)
ydirson committed Apr 18, 2023
1 parent 1bf0ccc commit c4c1af1
Showing 62 changed files with 26 additions and 898 deletions.
13 changes: 7 additions & 6 deletions README-iso.md
Original file line number Diff line number Diff line change
@@ -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
255 changes: 0 additions & 255 deletions configs/8.2.updates/packages.lst

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 0 additions & 17 deletions configs/8.3.0/yum.conf.tmpl

This file was deleted.

3 changes: 0 additions & 3 deletions configs/8.3.0/yumdl.conf.tmpl

This file was deleted.

156 changes: 0 additions & 156 deletions configs/8.3.testing/packages.lst

This file was deleted.

20 changes: 0 additions & 20 deletions configs/8.3.testing/yum-repos.conf.tmpl

This file was deleted.

17 changes: 0 additions & 17 deletions configs/8.3.testing/yum.conf.tmpl

This file was deleted.

3 changes: 0 additions & 3 deletions configs/8.3.testing/yumdl.conf.tmpl

This file was deleted.

3 changes: 0 additions & 3 deletions configs/8.3.testing/yumdl.flags

This file was deleted.

156 changes: 0 additions & 156 deletions configs/8.3.updates/packages.lst

This file was deleted.

13 changes: 0 additions & 13 deletions configs/8.3.updates/yum-repos.conf.tmpl

This file was deleted.

17 changes: 0 additions & 17 deletions configs/8.3.updates/yum.conf.tmpl

This file was deleted.

3 changes: 0 additions & 3 deletions configs/8.3.updates/yumdl.conf.tmpl

This file was deleted.

3 changes: 0 additions & 3 deletions configs/8.3.updates/yumdl.flags

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion installimg/8.2.testing

This file was deleted.

1 change: 0 additions & 1 deletion installimg/8.3.testing

This file was deleted.

1 change: 0 additions & 1 deletion installimg/8.3.updates

This file was deleted.

34 changes: 0 additions & 34 deletions iso/8.2.updates/.treeinfo

This file was deleted.

54 changes: 0 additions & 54 deletions iso/8.2.updates/boot/grub/grub.cfg

This file was deleted.

15 changes: 0 additions & 15 deletions iso/8.2.updates/boot/isolinux/pg_help

This file was deleted.

14 changes: 0 additions & 14 deletions iso/8.2.updates/boot/isolinux/pg_main

This file was deleted.

Binary file removed iso/8.2.updates/boot/isolinux/splash.lss
Binary file not shown.
6 changes: 3 additions & 3 deletions iso/8.2.testing/.treeinfo → iso/8.2/.treeinfo
Original file line number Diff line number Diff line change
@@ -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

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
55 changes: 0 additions & 55 deletions iso/8.3.0/boot/grub/grub-usb.cfg

This file was deleted.

29 changes: 0 additions & 29 deletions iso/8.3.0/boot/isolinux/isolinux.cfg

This file was deleted.

1 change: 0 additions & 1 deletion iso/8.3.testing

This file was deleted.

1 change: 0 additions & 1 deletion iso/8.3.updates

This file was deleted.

6 changes: 3 additions & 3 deletions iso/8.3.0/.treeinfo → iso/8.3/.treeinfo
Original file line number Diff line number Diff line change
@@ -2,19 +2,19 @@
platform_name = XCP
platform_version = 3.3.0
product_name = XCP-ng
product_version = 8.3.0
product_version = 8.3

[build]
number = cloud
[keys]
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

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions scripts/create-installimg.sh
Original file line number Diff line number Diff line change
@@ -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
;;
*)
6 changes: 3 additions & 3 deletions tests/0100-8.2-updates.t
Original file line number Diff line number Diff line change
@@ -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
'"
6 changes: 3 additions & 3 deletions tests/0101-8.2-testing.t
Original file line number Diff line number Diff line change
@@ -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
'"
6 changes: 3 additions & 3 deletions tests/0200-8.3-base.t
Original file line number Diff line number Diff line change
@@ -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
'"
6 changes: 3 additions & 3 deletions tests/0202-8.3-testing.t
Original file line number Diff line number Diff line change
@@ -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
'"

0 comments on commit c4c1af1

Please sign in to comment.