Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions scripts/ci/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,13 @@ _image_prefetcher_prebuilt_start() {
# prefect list stays up to date with additions.
ci_export "IMAGE_PULL_POLICY_FOR_QUAY_IO" "Never"
;;
*compatibility-tests)
image_prefetcher_start_set compatibility
# Override the default image pull policy for containers with quay.io
# images to rely on prefetched images. This helps ensure that the static
# prefect list stays up to date with additions.
ci_export "IMAGE_PULL_POLICY_FOR_QUAY_IO" "Never"
;;
*-operator-e2e-tests)
image_prefetcher_start_set operator-e2e
# TODO(ROX-20508): pre-fetch images of the release from which operator upgrade test starts as well.
Expand Down Expand Up @@ -773,6 +780,9 @@ _image_prefetcher_prebuilt_await() {
*sensor-integration-tests)
image_prefetcher_await_set sensor-integration
;;
*compatibility-tests)
image_prefetcher_await_set compatibility
;;
*-operator-e2e-tests)
image_prefetcher_await_set operator-e2e
# TODO(ROX-20508): pre-fetch images of the release from which operator upgrade test starts as well.
Expand Down Expand Up @@ -933,6 +943,9 @@ populate_prefetcher_image_list() {
sensor-integration)
cp "$SCRIPTS_ROOT/sensor/tests/images-to-prefetch.txt" "$image_list"
;;
compatibility)
cp "$SCRIPTS_ROOT/tests/images-to-prefetch.txt" "$image_list"
;;
*)
die "ERROR: An unsupported image prefetcher target was requested: $name"
;;
Expand Down
1 change: 1 addition & 0 deletions tests/e2e/run-compatibility.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ _run_compatibility_tests() {

test_preamble
setup_deployment_env false false

remove_existing_stackrox_resources
setup_default_TLS_certs
info "Creating mocked compliance operator data for compliance v1 tests"
Expand Down
4 changes: 2 additions & 2 deletions tests/yamls/multi-container-pod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ spec:
containers:
- name: 1st
image: quay.io/rhacs-eng/qa-multi-arch:nginx-1.21.1
imagePullPolicy: IfNotPresent
imagePullPolicy: Never
volumeMounts:
- name: html
mountPath: /usr/share/nginx/html
- name: 2nd
image: quay.io/rhacs-eng/qa-multi-arch:ubuntu-latest@sha256:64483f3496c1373bfd55348e88694d1c4d0c9b660dee6bfef5e12f43b9933b30
imagePullPolicy: IfNotPresent
imagePullPolicy: Never
volumeMounts:
- name: html
mountPath: /html
Expand Down
Loading