Skip to content

Commit

Permalink
Fix CI issues (#389)
Browse files Browse the repository at this point in the history
- modern builder for rhel kernels >= 8.3
- use pip3 instead of pip2
- image reload needs additional creds
  • Loading branch information
robbycochran authored Feb 18, 2021
1 parent 895c958 commit 114b1a2
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
14 changes: 10 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ commands:
working_directory: ~/.config/gcloud
command: |
if [[ -z "$ROX_CI_IMAGE" ]]; then
pip install --upgrade pip
pip install wheel
pip install -U crcmod google_compute_engine
pip install -U gcloud gsutil
pip3 install --upgrade pip
pip3 install wheel
pip3 install -U crcmod google_compute_engine
pip3 install -U gcloud gsutil
fi
sudo chown circleci:circleci /opt
gcloud components install gsutil -q
Expand Down Expand Up @@ -570,9 +570,14 @@ jobs:
tar -xzf "${bundle_file}" -C ~/kobuild-tmp/meta-inspect ./BUNDLE_DISTRO ./BUNDLE_VERSION
distro="$(< ~/kobuild-tmp/meta-inspect/BUNDLE_DISTRO)"
kernel_version="$(< ~/kobuild-tmp/meta-inspect/BUNDLE_VERSION)"
# SUSE and all kernels >= 5 can use modern builder
if [[ "$distro" == "suse" ]] || (( kernel_version >= 5 )); then
echo "$version" >>~/kobuild-tmp/custom-flavors/versions.modern
echo "Building kernel version $version with modern builder"
# RHEL 8.3+ kernels require a newer gcc and can be compiled with modern builder
elif [[ "$distro" == "redhat" && "$version" =~ ^.*el8_[3-9]\.x86_64$ ]]; then
echo "$version" >>~/kobuild-tmp/custom-flavors/versions.modern
echo "Building kernel version $version with modern builder"
elif grep -q "$distro" <~/kobuild-tmp/custom-flavors/all; then
echo "$version" >>~/kobuild-tmp/custom-flavors/versions."$distro"
echo "Building kernel version $version with custom builder flavor $distro"
Expand Down Expand Up @@ -1596,6 +1601,7 @@ workflows:
- test-module-sles-15-sp2-sap
- reload-released-images:
<<: *runOnAllTagsWithDockerIOPushCtx
context: docker-io-and-stackrox-io-push
requires:
- images
- update-support-packages:
Expand Down
5 changes: 3 additions & 2 deletions kernel-modules/BLOCKLIST
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
*.el6.*
# TODO(ROX-5396) - Fix collector probe compilation for 5.7-5.10 kernels
~5\.([7-9]|10)\..*
# TODO(ROX-5809) - Fix collector probe compilation for 4.19. cloud Debian kernels
~4\.19.*cloud.*
# TODO(ROX-6615) - Kernel crawler deletes debian kernels
4.19.0-10-cloud-amd64
4.19.0-14-amd64

0 comments on commit 114b1a2

Please sign in to comment.