Skip to content

ROX-9545: Retry request to quay in vulns check #785

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.

Sign up for GitHub

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

Closed
janisz wants to merge 3 commits into from
Closed

ROX-9545: Retry request to quay in vulns check #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be6ff9d
ROX-9545: Retry request to quay in vulns check
janisz Mar 2, 2022
a0c563f
HACK: Scan images in quay
janisz Mar 3, 2022
602de5d
curl: fail with body
janisz Mar 3, 2022
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
15 changes: 8 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5157,13 +5157,14 @@ workflows:
- scan-images-in-quay:
context:
- quay-rhacs-eng-readonly
filters:
tags:
only: /.*/
branches:
ignore: /.*/
requires:
- build
# TODO(do-not-merge): Hack to check if it's working
# filters:
# tags:
# only: /.*/
# branches:
# ignore: /.*/
# requires:
# - build

- openshift-ci-upgrade-test:
context:
Expand Down
23 changes: 16 additions & 7 deletions release/scripts/vuln_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@ GITROOT="$(git rev-parse --show-toplevel)"

# Helper method to call curl command to quay
function quay_curl {
curl -sS --fail -H "Authorization: Bearer ${QUAY_RHACS_ENG_BEARER_TOKEN}" -s -X GET "https://quay.io/api/v1/repository/rhacs-eng/${1}"
http_response=$(curl --retry 5 -s -v -o response.txt -w "%{http_code}" -H "Authorization: Bearer ${QUAY_RHACS_ENG_BEARER_TOKEN}" -s -X GET "https://quay.io/api/v1/repository/rhacs-eng/${1}")
if [ $http_response != 200 ]; then
echo "Server returned error: $http_response"
cat response.txt >&2
exit $http_response
else
cat response.txt
fi
}

# Check image scan results in quay.io and alert on new fixable vulns
Expand Down Expand Up @@ -87,18 +94,20 @@ function compare_fixable_vulns {
FAIL_SCRIPT=false

# determine all image tags
RELEASE_TAG=$(make --no-print-directory --quiet -C "${GITROOT}" tag)
COLLECTOR_TAG=$(make --no-print-directory --quiet -C "${GITROOT}" collector-tag)
SCANNER_TAG=$(make --no-print-directory --quiet -C "${GITROOT}" scanner-tag)
DOCS_PRERELEASE_TAG=$(make --no-print-directory --quiet -C "${GITROOT}" docs-tag)
#TODO(do-not-merge): Hack to check if it's working
RELEASE_TAG=3.68.1-0-g84d393a886
COLLECTOR_TAG=3.6.0
SCANNER_TAG=2.21.5
DOCS_PRERELEASE_TAG=d4821715-f57a81c2-b6d8cf96

ALLOWED_VULNS=$(jq -c '.[]' "$DIR/allowed_vulns.json")

# check docs image - using the pre-release tag (not the release tag)
compare_fixable_vulns "docs" "$DOCS_PRERELEASE_TAG"

# check main images
compare_fixable_vulns "main" "$RELEASE_TAG"

# check docs image - using the pre-release tag (not the release tag)
compare_fixable_vulns "docs" "$DOCS_PRERELEASE_TAG"

# check collector images
compare_fixable_vulns "collector" "${COLLECTOR_TAG}-slim"
Expand Down