Skip to content

Update the CI build & test image to one based on centos:stream8 #644

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

Merged
merged 6 commits into from
Mar 10, 2022

Conversation

gavin-stackrox
Copy link
Contributor

@gavin-stackrox gavin-stackrox commented Mar 3, 2022

This is an automated PR created from stackrox/rox-ci-image#115.

This PR updates the CI build & test image to one based on centos:stream8 (was ubuntu).

The only real change is that instances of tail +2 need to be tail -n +2 under centos.

Testing performed: Ran 5x+ CI to ensure no introduced flakes.

@gavin-stackrox gavin-stackrox changed the title Update apollo-ci image Update the CI build & test image to one based on centos:stream8 Mar 9, 2022
@gavin-stackrox gavin-stackrox force-pushed the roxbot/update-ci-image-from-115 branch from 874b0ac to eb05135 Compare March 9, 2022 17:17
@gavin-stackrox gavin-stackrox requested review from RTann and sbostk March 9, 2022 17:48
@@ -2,7 +2,7 @@
version: 2.1

defaultImage: &defaultImage
image: "quay.io/rhacs-eng/apollo-ci:0.3.26"
image: "quay.io/rhacs-eng/apollo-ci:stackrox-test-cci-0.3.32"
Copy link
Collaborator

Choose a reason for hiding this comment

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

new tagging convention?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, more or less, there may be a stackrox-test-osci- at some point. Though I hope that can just be stackrox-test-. There is also a stackrox-build- just for building which will be used in openshift CI and is used in stackrox/stackrox make main-build-dockerized.

@@ -31,9 +31,9 @@ main() {
mkdir -p "$log_dir"

set +e
for pod in $(kubectl -n "${namespace}" get po | tail +2 | awk '{print $1}'); do
for pod in $(kubectl -n "${namespace}" get po | tail -n +2 | awk '{print $1}'); do
Copy link
Collaborator

Choose a reason for hiding this comment

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

based on the manpage, my understanding is this will print all lines starting from line 2 (not 0-indexed)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

right. in these cases it strips the column headings. in most cases in the 'code' tail -n +2 is used.

@RTann RTann requested a review from jvdm March 9, 2022 17:56
Copy link
Contributor

@sbostk sbostk left a comment

Choose a reason for hiding this comment

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

LGTM

@gavin-stackrox gavin-stackrox merged commit 5934e36 into master Mar 10, 2022
@gavin-stackrox gavin-stackrox deleted the roxbot/update-ci-image-from-115 branch March 10, 2022 20:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants