Skip to content

Commit 85ca94f

Browse files
Johan-Liebert1Johan-Liebert1
committed
wip test
1 parent 3f5a3c7 commit 85ca94f

File tree

7 files changed

+35
-160
lines changed

7 files changed

+35
-160
lines changed

‎crates/xtask/src/tmt.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,11 @@ pub(crate) fn update_integration() -> Result<()> {
779779
continue;
780780
};
781781

782+
if stem != "testing-ex" {
783+
println!("SKIPPING: {stem}");
784+
continue
785+
}
786+
782787
let content =
783788
std::fs::read_to_string(&path).with_context(|| format!("Reading {}", filename))?;
784789

@@ -814,6 +819,8 @@ pub(crate) fn update_integration() -> Result<()> {
814819

815820
let test_command = format!("{} {}", extension, relative_path.display());
816821

822+
println!("test_command: {test_command}");
823+
817824
// Check if test wants bind storage
818825
let try_bind_storage = metadata
819826
.extra

‎crates/xtask/src/xtask.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
//! by the user - add commands here which otherwise might
55
//! end up as a lot of nontrivial bash code.
66
7+
#![allow(dead_code)]
8+
79
use std::fs::File;
810
use std::io::{BufRead, BufReader, BufWriter, Write};
911
use std::process::Command;
@@ -392,10 +394,10 @@ fn update_json_schemas(sh: &Shell) -> Result<()> {
392394
#[context("Updating generated files")]
393395
fn update_generated(sh: &Shell) -> Result<()> {
394396
// Update man pages (create new templates + sync options)
395-
man::update_manpages(sh)?;
397+
// man::update_manpages(sh)?;
396398

397399
// Update JSON schemas
398-
update_json_schemas(sh)?;
400+
// update_json_schemas(sh)?;
399401

400402
// Update TMT integration.fmf
401403
tmt::update_integration()?;

‎docs/src/host-v1.schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@
199199
"description": "Bootloader type to determine whether system was booted via Grub or Systemd",
200200
"oneOf": [
201201
{
202-
"description": "Use Grub as the booloader",
202+
"description": "Use Grub as the bootloader",
203203
"type": "string",
204204
"const": "Grub"
205205
},

‎docs/src/man/bootc-install-print-configuration.8.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@ filesystem type from the container image.
1919
At the current time, the only output key is `root-fs-type` which is a
2020
string-valued filesystem name suitable for passing to `mkfs.\$type`.
2121

22+
# OPTIONS
23+
2224
<!-- BEGIN GENERATED OPTIONS -->
25+
**--all**
26+
27+
Print all configuration
28+
2329
<!-- END GENERATED OPTIONS -->
2430

2531
# VERSION

‎tmt/plans/integration.fmf‎

Lines changed: 3 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -37,97 +37,10 @@ execute:
3737
how: tmt
3838

3939
# BEGIN GENERATED PLANS
40-
/plan-01-readonly:
41-
summary: Execute booted readonly/nondestructive tests
40+
/plan-450-testing-ex:
41+
summary: Some random test
4242
discover:
4343
how: fmf
4444
test:
45-
- /tmt/tests/tests/test-01-readonly
46-
extra-try_bind_storage: true
47-
48-
/plan-20-image-pushpull-upgrade:
49-
summary: Execute local upgrade tests
50-
discover:
51-
how: fmf
52-
test:
53-
- /tmt/tests/tests/test-20-image-pushpull-upgrade
54-
55-
/plan-21-logically-bound-switch:
56-
summary: Execute logically bound images tests for switching images
57-
discover:
58-
how: fmf
59-
test:
60-
- /tmt/tests/tests/test-21-logically-bound-switch
61-
62-
/plan-22-logically-bound-install:
63-
summary: Execute logically bound images tests for installing image
64-
discover:
65-
how: fmf
66-
test:
67-
- /tmt/tests/tests/test-22-logically-bound-install
68-
69-
/plan-23-install-outside-container:
70-
summary: Execute tests for installing outside of a container
71-
discover:
72-
how: fmf
73-
test:
74-
- /tmt/tests/tests/test-23-install-outside-container
75-
76-
/plan-23-usroverlay:
77-
summary: Execute tests for bootc usrover
78-
discover:
79-
how: fmf
80-
test:
81-
- /tmt/tests/tests/test-23-usroverlay
82-
83-
/plan-24-image-upgrade-reboot:
84-
summary: Execute local upgrade tests
85-
discover:
86-
how: fmf
87-
test:
88-
- /tmt/tests/tests/test-24-image-upgrade-reboot
89-
extra-try_bind_storage: true
90-
91-
/plan-25-soft-reboot:
92-
summary: Execute soft reboot test
93-
discover:
94-
how: fmf
95-
test:
96-
- /tmt/tests/tests/test-25-soft-reboot
97-
98-
/plan-26-examples-build:
99-
summary: Test bootc examples build scripts
100-
discover:
101-
how: fmf
102-
test:
103-
- /tmt/tests/tests/test-26-examples-build
104-
adjust:
105-
- when: running_env != image_mode
106-
enabled: false
107-
because: packit tests use RPM bootc and does not install /usr/lib/bootc/initramfs-setup
108-
109-
/plan-27-custom-selinux-policy:
110-
summary: Execute custom selinux policy test
111-
discover:
112-
how: fmf
113-
test:
114-
- /tmt/tests/tests/test-27-custom-selinux-policy
115-
adjust:
116-
- when: running_env != image_mode
117-
enabled: false
118-
because: these tests require features only available in image mode
119-
120-
/plan-28-factory-reset:
121-
summary: Execute factory reset tests
122-
discover:
123-
how: fmf
124-
test:
125-
- /tmt/tests/tests/test-28-factory-reset
126-
127-
/plan-29-soft-reboot-selinux-policy:
128-
summary: Test soft reboot with SELinux policy changes
129-
discover:
130-
how: fmf
131-
test:
132-
- /tmt/tests/tests/test-29-soft-reboot-selinux-policy
45+
- /tmt/tests/tests/test-450-testing-ex
13346
# END GENERATED PLANS

‎tmt/tests/booted/test-testing-ex.nu‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# number: 450
2+
# tmt:
3+
# summary: Some random test
4+
# duration: 5m
5+
#
6+
# Verify that something works
7+
8+
def main[] {
9+
echo "The test has passed"
10+
}

‎tmt/tests/tests.fmf‎

Lines changed: 4 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,7 @@
11
# THIS IS GENERATED CODE - DO NOT EDIT
22
# Generated by: cargo xtask tmt
33

4-
/test-01-readonly:
5-
summary: Execute booted readonly/nondestructive tests
6-
duration: 30m
7-
test: nu booted/test-01-readonly.nu
8-
9-
/test-20-image-pushpull-upgrade:
10-
summary: Execute local upgrade tests
11-
duration: 30m
12-
test: nu booted/test-image-pushpull-upgrade.nu
13-
14-
/test-21-logically-bound-switch:
15-
summary: Execute logically bound images tests for switching images
16-
duration: 30m
17-
test: nu booted/test-logically-bound-switch.nu
18-
19-
/test-22-logically-bound-install:
20-
summary: Execute logically bound images tests for installing image
21-
duration: 30m
22-
test: nu booted/test-logically-bound-install.nu
23-
24-
/test-23-install-outside-container:
25-
summary: Execute tests for installing outside of a container
26-
duration: 30m
27-
test: nu booted/test-install-outside-container.nu
28-
29-
/test-23-usroverlay:
30-
summary: Execute tests for bootc usrover
31-
duration: 30m
32-
test: nu booted/test-usroverlay.nu
33-
34-
/test-24-image-upgrade-reboot:
35-
summary: Execute local upgrade tests
36-
duration: 30m
37-
test: nu booted/test-image-upgrade-reboot.nu
38-
39-
/test-25-soft-reboot:
40-
summary: Execute soft reboot test
41-
duration: 30m
42-
test: nu booted/test-soft-reboot.nu
43-
44-
/test-26-examples-build:
45-
summary: Test bootc examples build scripts
46-
duration: 45m
47-
adjust:
48-
- when: running_env != image_mode
49-
enabled: false
50-
because: packit tests use RPM bootc and does not install /usr/lib/bootc/initramfs-setup
51-
test: bash booted/test-26-examples-build.sh
52-
53-
/test-27-custom-selinux-policy:
54-
summary: Execute custom selinux policy test
55-
duration: 30m
56-
adjust:
57-
- when: running_env != image_mode
58-
enabled: false
59-
because: these tests require features only available in image mode
60-
test: nu booted/test-custom-selinux-policy.nu
61-
62-
/test-28-factory-reset:
63-
summary: Execute factory reset tests
64-
duration: 30m
65-
test: nu booted/test-factory-reset.nu
66-
67-
/test-29-soft-reboot-selinux-policy:
68-
summary: Test soft reboot with SELinux policy changes
69-
duration: 30m
70-
test: nu booted/test-soft-reboot-selinux-policy.nu
4+
/test-450-testing-ex:
5+
summary: Some random test
6+
duration: 5m
7+
test: nu booted/test-testing-ex.nu

0 commit comments

Comments
 (0)