Skip to content

Commit

Permalink
Adding support el9-snapshot in dnfconfig
Browse files Browse the repository at this point in the history
Adding el9-snapshot repo-bundle to help the eext team run experiments
to see if builds are compatible with newer Buildrequires. These point
to a snapshot captured at the given date of the el9 upstream repo of
alma-linux (x86_64 and aarch64 rpms) and alma-vault (i686 rpms).

Please note that we haven't specified any default snapshot value for the
repo-bundle. This is because users should use el9 repo-bundle whenever
possible. Only in the case of the package requiring the latest release
(which hasn't been vaulted yet), the eext team will snapshot the
el9-unsafe repo and provide the snapshot version, which the user should
use in their repo-bundle.
  • Loading branch information
manith-arista committed Jul 19, 2024
1 parent d01e562 commit 7c807fa
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
23 changes: 23 additions & 0 deletions configfiles/dnfconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,34 @@ repo-bundle:
# DO NOT use any repo bundles below this unless you know what you're doing.
# ********************************************************************************************

#---------------------------------------------------------------------------------------------

Check warning on line 52 in configfiles/dnfconfig.yaml

View workflow job for this annotation

GitHub Actions / Lint

52:2 [comments] missing starting space in comment
el9-snapshot:
# DO NOT use el9-snapshot as a repo-bundle in your eext.yaml, unless recommended to you by the eext team.
# el9-snapshot is a snapshot of the repo cache of el9-unsafe.
# The eext team is responsible for creating these snapshots.

gpgcheck: true
gpgkey: file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9
baseurl: '{{.Host}}/artifactory/eext-snapshots-local/el9/{{.Version}}/9/{{.RepoName}}/{{.Arch}}/os'
repo:
AppStream:
enabled: true
BaseOS:
enabled: true
CRB:
enabled: true
devel:
enabled: false
extras:
enabled: false
#---------------------------------------------------------------------------------------------

Check warning on line 72 in configfiles/dnfconfig.yaml

View workflow job for this annotation

GitHub Actions / Lint

72:2 [comments] missing starting space in comment

Check warning on line 72 in configfiles/dnfconfig.yaml

View workflow job for this annotation

GitHub Actions / Lint

72:1 [comments-indentation] comment not indented like content

# --------------------------------------------------------------------------------------------
el9-unsafe:
# DO NOT use el9-unsafe as a repo-bundle in your eext.yaml unless you know what you're doing.
# Use el9 because the defaults there will ensure build reproducibility.
# el9-unsafe is used by the eext team for experiments.

gpgcheck: true
gpgkey: file:///usr/share/distribution-gpg-keys/alma/RPM-GPG-KEY-AlmaLinux-9

Expand Down
17 changes: 17 additions & 0 deletions dnfconfig/defaultconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,23 @@ func TestDefaultDnfRepoConfig(t *testing.T) {
},
defaultVersion: "9.3",
},
"el9-snapshot": ExpectedDefaultRepoBundle{
repoToURLFormatString: map[string]string{
"BaseOS": "%s/artifactory/%s/el9/default/%s/BaseOS/%s/os",
"CRB": "%s/artifactory/%s/el9/default/%s/CRB/%s/os",
},
archToArtifactoryRepo: map[string]string{
"i686": "eext-snapshots-local",
"x86_64": "eext-snapshots-local",
"aarch64": "eext-snapshots-local",
},
archToURLFormatArch: map[string]string{
"i686": "i686",
"x86_64": "x86_64",
"aarch64": "aarch64",
},
defaultVersion: "9",
},
"el9-unsafe": ExpectedDefaultRepoBundle{
repoToURLFormatString: map[string]string{
"BaseOS": "%s/artifactory/%s/%s/BaseOS/%s/os",
Expand Down

0 comments on commit 7c807fa

Please sign in to comment.