Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.

Support CentOS 8 RPMs#5320

Merged
ocket8888 merged 12 commits intoapache:masterfrom
zrhoffman:centos-8-rpms
Dec 1, 2020
Merged

Support CentOS 8 RPMs#5320
ocket8888 merged 12 commits intoapache:masterfrom
zrhoffman:centos-8-rpms

Conversation

@zrhoffman
Copy link
Copy Markdown
Member

@zrhoffman zrhoffman commented Nov 20, 2020

What does this PR (Pull Request) do?

  • This PR fixes RPMs only target CentOS 7 #5319
  • Adds the option to build for either CentOS 7 or CentOS 8. CentOS 7 is the default, except for CDN in a Box, which uses CentOS 8 RPMs by default.
  • Upgrades the builder Docker images to CentOS 8, although they can still be built for CentOS 7.

This PR builds off of @hbeatty's CentOS 8 progress from #5137.

Which Traffic Control components are affected by this PR?

  • CDN in a Box
  • Documentation
  • Build system

What is the best way to verify this PR?

  1. Check that Traffic Control works with RPMs built on and targeting CentOS 8

    make build-builders -j6
    docker-compose build --parallel
    docker-compose up
  2. Check that Traffic Control works with RPMs built on and targeting CentOS 7

    export RHEL_VERSION=7
    make build-builders -j6
    docker-compose build --parallel
    docker-compose up

The following criteria are ALL met by this PR

  • Existing tests are sufficient, no additional tests are unnecessary
  • This PR includes documentation
  • This PR includes an update to CHANGELOG.md
  • This PR includes any and all required license headers
  • This PR DOES NOT FIX A SERIOUS SECURITY VULNERABILITY (see the Apache Software Foundation's security guidelines for details)

Additional Information

Note that only Go-based projects contain binaries that elfdeps checks the linking for. The Go binaries have been statically linked since #4758, so that check does not find any dynamic section in the binaries, and we can use CentOS 8 builders to build RPMs targeting either CentOS 7 (the default for now) or CentOS 8.

@zrhoffman zrhoffman added new feature A new feature, capability or behavior cdn-in-a-box related to the Docker-based CDN-in-a-Box system build related to the build process os labels Nov 20, 2020
Comment thread infrastructure/cdn-in-a-box/Makefile Outdated
@zrhoffman
Copy link
Copy Markdown
Member Author

Rebased to fix merge conflicts

@zrhoffman zrhoffman requested a review from ocket8888 December 1, 2020 19:26
Copy link
Copy Markdown
Contributor

@ocket8888 ocket8888 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works

@ocket8888 ocket8888 merged commit c0126fc into apache:master Dec 1, 2020
ocket8888 pushed a commit that referenced this pull request Dec 2, 2020
* CENTOS_VERSION -> RHEL_VERSION

* Put help text in a here document

* Sort flags

* Optionally build or pull Docker builder images

* - Support building RPMs that target CentOS 8
  - Make CentOS 7 the default build target
  - Make CentOS 8 the default build target for CDN in a Box

* Uncomment build section

* Install common dependencies in common-dependencies build stage

* Install git and rpm-build as common dependencies

* Explicitly install rsync, as CentOS 7 makes rsync a git dependency but
CentOS 8 does not

* Upgrade builder images to CentOS 8

* Mark RHEL_VERSION for export if it is undefined

* Remove commented out line

Co-authored-by: Hank Beatty <hank.beatty@cox.com>
(cherry picked from commit c0126fc)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

build related to the build process cdn-in-a-box related to the Docker-based CDN-in-a-Box system new feature A new feature, capability or behavior os

Projects

None yet

Development

Successfully merging this pull request may close these issues.

RPMs only target CentOS 7

3 participants