Skip to content

Commit

Permalink
Revert "Do not inherit repositories in addons"
Browse files Browse the repository at this point in the history
  • Loading branch information
yselkowitz authored Jun 5, 2024
1 parent f2fe1bb commit f210ff7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 111 deletions.
2 changes: 1 addition & 1 deletion feedback_pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,6 @@ def _load_config_addon_view(document_id, document, settings):

# Choose one repository that gets used as a source.
config["base_view_id"] = str(document["data"]["base_view_id"])
config["repository"] = str(document["data"]["repository"])

except KeyError:
raise ConfigError("'{file}.yaml' - There's something wrong with the mandatory fields. Sorry I don't have more specific info.".format(file=document_id))
Expand Down Expand Up @@ -1132,6 +1131,7 @@ def get_configs(settings):


# Ading some extra fields onto the addon view
configs["views"][view_conf_id]["repository"] = configs["views"][base_view_id]["repository"]
configs["views"][view_conf_id]["architectures"] = configs["views"][base_view_id]["architectures"]

# Adjust view architecture based on repository architectures
Expand Down
105 changes: 0 additions & 105 deletions test_configs/repo-eln-extras.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions test_configs/repo-eln.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ data:
limit_arches: ["ppc64le", "x86_64"]
priority: 2

Extras:
baseurl: https://odcs.fedoraproject.org/composes/production/latest-Fedora-ELN/compose/Extras/$basearch/os/
koji_api_url: https://koji.fedoraproject.org/kojihub
koji_files_url: https://kojipkgs.fedoraproject.org
exclude: ["exim", "esmtp", "opensmtpd", "esmtp-local-delivery"]
priority: 3

Rawhide:
baseurl: https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/
Expand Down
5 changes: 0 additions & 5 deletions test_configs/view-eln-extras.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ data:
# (mandatory field)
base_view_id: view-eln

# ID of the repositories where this addon and its base are shipped.
#
# (mandatory field)
repository: repo-eln-extras

# Labels connect things together.
# Workloads get installed in environments with the same label.
# They also get included in views with the same label.
Expand Down

0 comments on commit f210ff7

Please sign in to comment.