Skip to content

Commit

Permalink
Update default Linux distros: drop Fedora 35 and add Fedora 37 (#3327)
Browse files Browse the repository at this point in the history
Also add RPM build for Fedora 38.
  • Loading branch information
webbnh authored Mar 11, 2023
1 parent e3a98da commit d9c95e6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion agent/containers/images/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ _ALL_RPMS = ${_TOOL_RPMS} ${_WORKLOAD_RPMS}
# By default we only build images for the following distributions.
_DEFAULT_DISTROS = \
centos-9 centos-8 centos-7 \
fedora-36 fedora-35
fedora-37 fedora-36
# rhel-9 rhel-8 rhel-7

# This Makefile produces containers named "pbench-agent-<name>-<distro>"; this
Expand Down
2 changes: 1 addition & 1 deletion agent/rpm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ CHROOTS =
# target builds them all.
RHEL_RPMS = rhel-9-rpm rhel-8-rpm rhel-7-rpm
CENTOS_RPMS = centos-9-rpm centos-8-rpm centos-7-rpm
FEDORA_RPMS = fedora-36-rpm fedora-35-rpm
FEDORA_RPMS = fedora-38-rpm fedora-37-rpm fedora-36-rpm
ALL_RPMS = ${RHEL_RPMS} ${CENTOS_RPMS} ${FEDORA_RPMS}

component = agent
Expand Down
2 changes: 1 addition & 1 deletion jenkins/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ include ../utils/utils.mk
# RPMs
RPMBUILD_BASEIMAGE_DEFAULTS = \
rhel-9 rhel-8 rhel-7 \
fedora-36 fedora-35 \
fedora-38 fedora-37 fedora-36 \
centos-9 centos-8 centos-7

# All Fedora images are based on Fedora 36
Expand Down

0 comments on commit d9c95e6

Please sign in to comment.