Skip to content

Commit 6cbd173

Browse files
therazixtherazix
committed
squash: use step._raw_data 
1 parent 157b200 commit 6cbd173

6 files changed

Lines changed: 73 additions & 196 deletions

File tree

‎tests/recipe/data/import.yaml‎

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,9 @@ plans:
1616
discover:
1717
enabled: true
1818
phases:
19-
- name: default-0
20-
how: fmf
21-
order: 50
22-
url-content-type: git
23-
dist-git-source: false
24-
dist-git-download-only: false
25-
dist-git-install-builddeps: false
26-
filter:
27-
- tag:remote
28-
modified-only: false
29-
dist-git-init: false
30-
dist-git-remove-fmf-root: false
31-
dist-git-merge: false
32-
sync-repo: false
33-
fmf-id: false
34-
prune: false
19+
- how: fmf
20+
filter: tag:remote
21+
name: default-0
3522
tests:
3623
- name: /tests/one
3724
discover-phase: default-0
@@ -70,58 +57,40 @@ plans:
7057
provision:
7158
enabled: false
7259
phases:
73-
- name: default-0
74-
how: local
75-
order: 50
76-
become: false
60+
- how: local
61+
name: default-0
7762
prepare:
7863
enabled: false
7964
phases:
8065
- name: enable-latest-copr
81-
how: install
82-
order: 50
8366
summary: Enable copr repo with the latest tmt bits
84-
copr:
85-
- '@teemtee/latest'
86-
missing: fail
67+
how: install
68+
copr: '@teemtee/latest'
8769
- name: disable-tag-repo
88-
how: shell
89-
order: 50
9070
summary: Completely disable the tag repository
91-
script:
92-
- "dnf repolist | grep testing-farm-tag-repository || exit 0\nif command
93-
-v dnf5; then\n dnf config-manager setopt testing-farm-tag-repository.enabled=0\n\
71+
how: shell
72+
script: "dnf repolist | grep testing-farm-tag-repository || exit 0\nif
73+
command -v dnf5; then\n dnf config-manager setopt testing-farm-tag-repository.enabled=0\n\
9474
else\n dnf config-manager --set-disabled testing-farm-tag-repository\n\
9575
fi\n"
9676
execute:
9777
enabled: false
9878
phases:
99-
- name: default-0
100-
how: tmt
101-
order: 50
102-
duration: 1h
103-
ignore-duration: false
104-
exit-first: false
105-
interactive: false
106-
restraint-compatible: false
107-
no-progress-bar: false
79+
- how: tmt
80+
name: default-0
10881
results-path: plans/import/execute/results.yaml
10982
report:
11083
enabled: false
11184
phases:
11285
- name: default-0
11386
how: display
114-
order: 50
115-
display-guest: auto
11687
finish:
11788
enabled: false
11889
phases:
11990
- name: default-0
12091
how: shell
121-
order: 50
12292
cleanup:
12393
enabled: false
12494
phases:
12595
- name: default-0
12696
how: tmt
127-
order: 50

‎tests/recipe/data/insert.yaml‎

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,49 @@ plans:
1616
phases:
1717
- name: discover-shell
1818
how: shell
19-
order: 50
20-
url-content-type: git
21-
dist-git-source: false
22-
dist-git-download-only: false
23-
dist-git-install-builddeps: false
24-
keep-git-metadata: false
2519
tests:
2620
- name: /shell-test
2721
test: /bin/true
28-
enabled: true
29-
order: 50
30-
manual: false
31-
tty: false
32-
duration: 1h
33-
result: respect
34-
- name: default-0
35-
how: fmf
22+
- how: fmf
23+
allowed-how:
24+
name: default-0
3625
order: 50
26+
url:
3727
url-content-type: git
28+
ref:
29+
dist-git-source:
30+
dist-git-type:
31+
dist-git-download-only:
32+
dist-git-install-builddeps:
33+
dist-git-require: []
34+
require-test: []
35+
path:
36+
test: []
37+
link: []
38+
filter: []
39+
include: []
40+
exclude: []
41+
modified-only:
42+
modified-url:
43+
modified-ref:
44+
dist-git-init:
45+
dist-git-remove-fmf-root:
46+
dist-git-merge:
47+
dist-git-extract:
48+
sync-repo:
49+
fmf-id:
50+
prune:
51+
repository:
52+
revision:
53+
verbose: 0
54+
debug: 0
55+
quiet:
56+
log-topic: []
57+
force:
58+
dry: false
59+
again:
60+
feeling-safe: false
61+
exposable-runner-devices: []
3862
tests:
3963
- name: /discover-shell/shell-test
4064
discover-phase: discover-shell
@@ -96,53 +120,33 @@ plans:
96120
provision:
97121
enabled: true
98122
phases:
99-
- name: default-0
100-
how: container
101-
order: 50
102-
become: false
123+
- how: container
103124
environment:
104125
PROVISION_ENV: provision_value
105-
image: fedora
106-
user: root
107-
force-pull: false
108-
pull-attempts: 5
109-
pull-interval: 5
110-
stop-time: 1
126+
name: default-0
111127
prepare:
112128
enabled: true
113129
phases:
114130
- name: default-0
115131
how: shell
116-
order: 50
117132
execute:
118133
enabled: true
119134
phases:
120-
- name: default-0
121-
how: tmt
122-
order: 50
123-
duration: 1h
124-
ignore-duration: false
125-
exit-first: false
126-
interactive: false
127-
restraint-compatible: false
128-
no-progress-bar: false
135+
- how: tmt
136+
name: default-0
129137
results-path: plans/insert/execute/results.yaml
130138
report:
131139
enabled: true
132140
phases:
133141
- name: default-0
134142
how: display
135-
order: 50
136-
display-guest: auto
137143
finish:
138144
enabled: true
139145
phases:
140146
- name: default-0
141147
how: shell
142-
order: 50
143148
cleanup:
144149
enabled: true
145150
phases:
146151
- name: default-0
147152
how: tmt
148-
order: 50

‎tests/recipe/data/local.yaml‎

Lines changed: 8 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,11 @@ plans:
1818
phases:
1919
- name: discover-fmf
2020
how: fmf
21-
order: 50
22-
url-content-type: git
23-
dist-git-source: false
24-
dist-git-download-only: false
25-
dist-git-install-builddeps: false
26-
modified-only: false
27-
dist-git-init: false
28-
dist-git-remove-fmf-root: false
29-
dist-git-merge: false
30-
sync-repo: false
31-
fmf-id: false
32-
prune: false
3321
- name: discover-shell
3422
how: shell
35-
order: 50
36-
url-content-type: git
37-
dist-git-source: false
38-
dist-git-download-only: false
39-
dist-git-install-builddeps: false
40-
keep-git-metadata: false
4123
tests:
4224
- name: /shell-test
4325
test: /bin/true
44-
enabled: true
45-
order: 50
46-
manual: false
47-
tty: false
48-
duration: 1h
49-
result: respect
5026
tests:
5127
- name: /discover-fmf/tests/first
5228
discover-phase: discover-fmf
@@ -108,57 +84,35 @@ plans:
10884
provision:
10985
enabled: true
11086
phases:
111-
- name: default-0
112-
how: container
113-
order: 50
114-
become: false
87+
- how: container
11588
environment:
11689
PROVISION_ENV: provision_value
117-
image: fedora
118-
user: root
119-
force-pull: false
120-
pull-attempts: 5
121-
pull-interval: 5
122-
stop-time: 1
90+
name: default-0
12391
prepare:
12492
enabled: true
12593
phases:
126-
- name: default-0
127-
how: shell
128-
order: 50
129-
script:
130-
- echo "Prepare phase"
94+
- how: shell
95+
script: echo "Prepare phase"
96+
name: default-0
13197
execute:
13298
enabled: true
13399
phases:
134100
- name: Execute phase
135101
how: tmt
136-
order: 50
137-
duration: 1h
138-
ignore-duration: false
139-
exit-first: false
140-
interactive: false
141-
restraint-compatible: false
142-
no-progress-bar: false
143102
results-path: plans/local/execute/results.yaml
144103
report:
145104
enabled: true
146105
phases:
147106
- name: default-0
148107
how: display
149-
order: 50
150-
display-guest: auto
151108
finish:
152109
enabled: true
153110
phases:
154-
- name: default-0
155-
how: shell
156-
order: 50
157-
script:
158-
- echo "Finish phase"
111+
- how: shell
112+
script: echo "Finish phase"
113+
name: default-0
159114
cleanup:
160115
enabled: true
161116
phases:
162117
- name: default-0
163118
how: tmt
164-
order: 50

0 commit comments

Comments
 (0)