Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rhel 8 support #598

Merged
merged 3 commits into from
Jul 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
copr_ownername: "@fedora-llvm-team"
copr_project_tpl: "llvm-snapshots-big-merge-YYYYMMDD"
copr_monitor_tpl: "https://copr.fedorainfracloud.org/coprs/g/fedora-llvm-team/llvm-snapshots-big-merge-YYYYMMDD/monitor/"
chroot_pattern: '^(fedora-(rawhide|[0-9]+)|rhel-9-)'
chroot_pattern: '^(fedora-(rawhide|[0-9]+)|rhel-[8,9]-)'
packages: "llvm"
# - name: bootstrap
# maintainer_handle: "kwk"
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/fedora-copr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,18 @@ jobs:
--delete-after-days 32 \
$chroot_opts "${{ env.project_today }}"

- name: "Enable swig:4.0 module in RHEL 8 build chroots (if any)"
shell: bash -e {0}
run: |
source scripts/functions.sh
[[ ! -z "${{ matrix.extra_script_file }}" ]] && source ${{ matrix.extra_script_file }}

for chroot in ${{ env.chroots }}; do
if [[ "$chroot" == rhel-8-* ]]; then
copr edit-chroot --modules "swig:4.0" ${{ env.project_today }}/$chroot
fi
done

- name: "Create today's packages: ${{ env.packages }}"
shell: bash -e {0}
run: |
Expand Down
2 changes: 1 addition & 1 deletion scripts/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function get_active_build_ids(){

# Prints the chroots we care about.
function get_chroots() {
copr list-chroots | grep -P '^(fedora-(rawhide|[0-9]+)|rhel-9-)' | sort | tr '\n' ' '
copr list-chroots | grep -P '^(fedora-(rawhide|[0-9]+)|rhel-[8,9]-)' | sort | tr '\n' ' '
}

# Prints the packages we care about
Expand Down
2 changes: 1 addition & 1 deletion snapshot_manager/snapshot_manager/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

@dataclasses.dataclass(kw_only=True)
class Config:
chroot_pattern: str = r"^(fedora-(rawhide|[0-9]+)|rhel-9-)"
chroot_pattern: str = r"^(fedora-(rawhide|[0-9]+)|rhel-[8,9]-)"
"""Regular expression to select chroots from all chroots currently supported on Copr."""

packages: list[str] = dataclasses.field(
Expand Down
2 changes: 2 additions & 0 deletions snapshot_manager/snapshot_manager/testing_farm_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,8 @@ def get_compose(cls, chroot: str) -> str:
'Fedora-39'
>>> TestingFarmRequest.get_compose("rhel-9-aarch")
'RHEL-9-Nightly'
>>> TestingFarmRequest.get_compose("rhel-8-x86_64")
'RHEL-8-Nightly'
"""
util.expect_chroot(chroot)

Expand Down
Loading