Skip to content

Commit 3cb4ceb

Browse files
AdamSalehAdamSaleh
committed
Changed configs relevant to test not to reference eln.
1 parent 32b538a commit 3cb4ceb

File tree

4 files changed

+108
-69
lines changed

4 files changed

+108
-69
lines changed

‎test_configs/base-test.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,15 @@ data:
4343
#
4444
# (mandatory field)
4545
packages:
46-
- fedora-repos-eln
47-
- fedora-release-eln
46+
- bash
4847

4948
# Labels connect things together.
5049
# Workloads get installed in environments with the same label.
5150
# They also get included in views with the same label.
5251
#
5352
# (mandatory field)
5453
labels:
55-
- eln
56-
- eln-but-not-included
57-
- eln-extras
54+
- test
5855

5956
### OPTIONAL FIELDS ###
6057

‎test_configs/bash-test.yaml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
---
2+
# This configuration file defines a "Workload" in Feedback Pipeline.
3+
# https://tiny.distro.builders
4+
#
5+
# Workload is a set of packages with a purpouse that someone cares about.
6+
# They might want to monitor it for the install size, dependencies that get
7+
# pulled in, etc.
8+
9+
document: feedback-pipeline-workload
10+
version: 1
11+
data:
12+
# id is the filename — that automatically prevents collisions for free!
13+
14+
15+
### MANDATORY FIELDS ###
16+
17+
# Name is an identifier for humans
18+
#
19+
# (mandatory field)
20+
name: Bash
21+
22+
# A short description, perhaps hinting the purpose
23+
#
24+
# (mandatory field)
25+
description: Bash
26+
27+
# Who maintains it? This is just a freeform string
28+
# for humans to read. In Fedora, a FAS nick is recommended.
29+
#
30+
# (mandatory field)
31+
maintainer: asamalik
32+
33+
# Packages defining this workload.
34+
# This list includes packages for all
35+
# architectures — that's the one to use by default.
36+
#
37+
# (mandatory field)
38+
packages:
39+
- bash
40+
41+
# Labels connect things together.
42+
# Workloads get installed in environments with the same label.
43+
# They also get included in views with the same label.
44+
#
45+
# (mandatory field)
46+
labels:
47+
- test
48+
options:
49+
- strict
50+
51+
52+
### OPTIONAL FIELDS ###
53+
54+
# Architecture-specific packages.
55+
#
56+
# (optional field)
57+
#arch_packages:
58+
# x86_64:
59+
# - arch-specific-package
60+
61+
# Extra installation options.
62+
# The following are now supported:
63+
# - "include-docs" - include documentation packages
64+
# - "include-weak-deps" - automatically pull in "recommends" weak dependencies
65+
#
66+
# (optional field)
67+
#options:
68+
#- option

‎test_configs/view-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ data:
66
description: Test package set based on F34
77
maintainer: bakery
88
labels:
9-
- eln
9+
- test
1010
repository: repo-test
1111
buildroot_strategy: dep_tracker
1212

‎test_feedback_pipeline.py

Lines changed: 37 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -20,81 +20,55 @@ def feedback_pipeline_output():
2020

2121

2222
def test_bash_test_repo_workload(feedback_pipeline_output):
23-
expected_pkg_added_ids = set([
24-
'filesystem-3.14-5.fc34.aarch64',
25-
'glibc-minimal-langpack-2.33-5.fc34.aarch64',
23+
expected_pkg_env_ids = set([
2624
'tzdata-2021a-1.fc34.noarch',
27-
'basesystem-11-11.fc34.noarch',
28-
'bash-5.1.0-2.fc34.aarch64',
29-
'ncurses-libs-6.2-4.20200222.fc34.aarch64',
30-
'ncurses-base-6.2-4.20200222.fc34.noarch',
25+
'fedora-gpg-keys-34-1.noarch',
26+
'fedora-release-common-34-1.noarch',
27+
'glibc-minimal-langpack-2.33-5.fc34.aarch64',
3128
'libgcc-11.0.1-0.3.fc34.aarch64',
32-
'glibc-2.33-5.fc34.aarch64',
3329
'setup-2.13.7-3.fc34.noarch',
34-
'glibc-common-2.33-5.fc34.aarch64'
30+
'basesystem-11-11.fc34.noarch',
31+
'glibc-2.33-5.fc34.aarch64',
32+
'fedora-release-34-1.noarch',
33+
'ncurses-base-6.2-4.20200222.fc34.noarch',
34+
'ncurses-libs-6.2-4.20200222.fc34.aarch64',
35+
'bash-5.1.0-2.fc34.aarch64',
36+
'filesystem-3.14-5.fc34.aarch64',
37+
'glibc-common-2.33-5.fc34.aarch64',
38+
'fedora-release-identity-basic-34-1.noarch',
39+
'fedora-repos-34-1.noarch'
3540
])
3641

37-
with open(f"{feedback_pipeline_output}/workload--bash--base-test--repo-test--aarch64.json") as w:
42+
with open(f"{feedback_pipeline_output}/workload--bash-test--base-test--repo-test--aarch64.json") as w:
3843
workload = json.load(w)
39-
assert set(workload["data"]["pkg_added_ids"]) == expected_pkg_added_ids
44+
assert set(workload["data"]["pkg_env_ids"]) == expected_pkg_env_ids
4045

4146
def test_bash_test_repo_view(feedback_pipeline_output):
42-
expected_pkgs = {'alternatives-1.15-2.fc34',
43-
'basesystem-11-11.fc34',
44-
'bash-5.1.0-2.fc34',
45-
'ca-certificates-2020.2.41-7.fc34',
46-
'coreutils-8.32-21.fc34',
47-
'coreutils-common-8.32-21.fc34',
48-
'crypto-policies-20210213-1.git5c710c0.fc34',
49-
'fedora-gpg-keys-34-1',
50-
'fedora-release-34-1',
51-
'fedora-release-common-34-1',
52-
'fedora-release-identity-basic-34-1',
53-
'fedora-repos-34-1',
54-
'fedora-repos-eln-34-1',
55-
'fedora-repos-rawhide-34-1',
56-
'filesystem-3.14-5.fc34',
57-
'gc-8.0.4-5.fc34',
58-
'glibc-2.33-5.fc34',
59-
'glibc-common-2.33-5.fc34',
60-
'glibc-minimal-langpack-2.33-5.fc34',
61-
'gmp-1:6.2.0-6.fc34',
62-
'grep-3.6-2.fc34',
63-
'guile22-2.2.7-2.fc34',
64-
'libacl-2.3.1-1.fc34',
65-
'libattr-2.5.1-1.fc34',
66-
'libcap-2.48-2.fc34',
67-
'libffi-3.1-28.fc34',
68-
'libgcc-11.0.1-0.3.fc34',
69-
'libselinux-3.2-1.fc34',
70-
'libsepol-3.2-1.fc34',
71-
'libstdc++-11.0.1-0.3.fc34',
72-
'libtasn1-4.16.0-4.fc34',
73-
'libtool-ltdl-2.4.6-40.fc34',
74-
'libunistring-0.9.10-10.fc34',
75-
'libxcrypt-4.4.18-1.fc34',
76-
'make-1:4.3-5.fc34',
77-
'ncurses-base-6.2-4.20200222.fc34',
78-
'ncurses-libs-6.2-4.20200222.fc34',
79-
'openssl-libs-1:1.1.1k-1.fc34',
80-
'p11-kit-0.23.22-3.fc34',
81-
'p11-kit-trust-0.23.22-3.fc34',
82-
'pcre-8.44-3.fc34.1',
83-
'pcre2-10.36-4.fc34',
84-
'pcre2-syntax-10.36-4.fc34',
85-
'pizza-package-000-placeholder',
86-
'readline-8.1-2.fc34',
87-
'sed-4.8-7.fc34',
88-
'setup-2.13.7-3.fc34',
89-
'tar-2:1.34-1.fc34',
90-
'tzdata-2021a-1.fc34',
91-
'zlib-1.2.11-26.fc34'}
47+
expected_pkgs = {}
9248

9349
with open(f"{feedback_pipeline_output}/view-packages--view-test.json") as w:
50+
expected_pkgs = {
51+
'fedora-gpg-keys-34-1',
52+
'fedora-release-34-1',
53+
'fedora-release-common-34-1',
54+
'fedora-release-identity-basic-34-1',
55+
'fedora-repos-34-1',
56+
'filesystem-3.14-5.fc34',
57+
'glibc-minimal-langpack-2.33-5.fc34',
58+
'tzdata-2021a-1.fc34',
59+
'basesystem-11-11.fc34',
60+
'bash-5.1.0-2.fc34',
61+
'ncurses-libs-6.2-4.20200222.fc34',
62+
'ncurses-base-6.2-4.20200222.fc34',
63+
'libgcc-11.0.1-0.3.fc34',
64+
'glibc-2.33-5.fc34',
65+
'setup-2.13.7-3.fc34',
66+
'glibc-common-2.33-5.fc34'
67+
}
9468
view = json.load(w)
9569
assert set(view['pkgs'].keys()) == expected_pkgs
9670

9771

9872

99-
if __name__ == "__main__":
100-
test_mock_argv()
73+
#if __name__ == "__main__":
74+
# test_mock_argv()

0 commit comments

Comments
 (0)